@codingame/monaco-vscode-extensions-service-override 9.0.3 → 10.0.0

package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js

@@ -8,7 +8,6 @@ import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { getWordAtText } from 'vscode/vscode/vs/editor/common/core/wordHelper';
-import { CompletionItemKind } from 'vscode/vscode/vs/editor/common/languages';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -124,8 +123,8 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 }
                 return this._proxy.$provideFollowups(request, handle, result, { history }, token);
             },
-            provideWelcomeMessage: (location, token) => {
-                return this._proxy.$provideWelcomeMessage(handle, location, token);
+            provideWelcomeMessage: (token) => {
+                return this._proxy.$provideWelcomeMessage(handle, token);
             },
             provideChatTitle: (history, token) => {
                 return this._proxy.$provideChatTitle(handle, history, token);
@@ -245,7 +244,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                         label: v.label,
                         range,
                         insertText: insertText + ' ',
-                        kind: CompletionItemKind.Text,
+                        kind: 18 ,
                         detail: v.detail,
                         documentation: v.documentation,
                         command: { id: AddDynamicVariableAction.ID, title: '', arguments: [{ id: v.id, widget, range: rangeAfterInsert, variableData: revive(v.value), command: v.command }] }
@@ -309,4 +308,4 @@ function computeCompletionRanges(model, position, reg) {
     return { insert, replace };
 }
 
-export { MainThreadChatAgents2 };
+export { MainThreadChatAgents2, MainThreadChatTask };

package/vscode/src/vs/workbench/api/browser/mainThreadChatCodeMapper.js

@@ -0,0 +1,57 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { ICodeMapperService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service';
+import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+
+var MainThreadChatCodemapper_1;
+let MainThreadChatCodemapper = class MainThreadChatCodemapper extends Disposable {
+    static { MainThreadChatCodemapper_1 = this; }
+    static { this._requestHandlePool = 0; }
+    constructor(extHostContext, codeMapperService) {
+        super();
+        this.codeMapperService = codeMapperService;
+        this.providers = this._register(( new DisposableMap()));
+        this._responseMap = ( new Map());
+        this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostCodeMapper));
+    }
+    $registerCodeMapperProvider(handle) {
+        const impl = {
+            mapCode: async (uiRequest, response, token) => {
+                const requestId = String(MainThreadChatCodemapper_1._requestHandlePool++);
+                this._responseMap.set(requestId, response);
+                const extHostRequest = {
+                    requestId,
+                    codeBlocks: uiRequest.codeBlocks,
+                    conversation: uiRequest.conversation
+                };
+                try {
+                    return await this._proxy.$mapCode(handle, extHostRequest, token).then((result) => result ?? undefined);
+                }
+                finally {
+                    this._responseMap.delete(requestId);
+                }
+            }
+        };
+        const disposable = this.codeMapperService.registerCodeMapperProvider(handle, impl);
+        this.providers.set(handle, disposable);
+    }
+    $unregisterCodeMapperProvider(handle) {
+        this.providers.deleteAndDispose(handle);
+    }
+    $handleProgress(requestId, data) {
+        const response = this._responseMap.get(requestId);
+        if (response) {
+            const resource = URI.revive(data.uri);
+            response.textEdit(resource, data.edits);
+        }
+        return Promise.resolve();
+    }
+};
+MainThreadChatCodemapper = MainThreadChatCodemapper_1 = __decorate([
+    extHostNamedCustomer(MainContext.MainThreadCodeMapper),
+    ( __param(1, ICodeMapperService))
+], MainThreadChatCodemapper);
+
+export { MainThreadChatCodemapper };

package/vscode/src/vs/workbench/api/browser/mainThreadComments.js

@@ -10,14 +10,13 @@ import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/bro
 import { CommentsPanel } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsView';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { COMMENTS_VIEW_ID, COMMENTS_VIEW_TITLE, COMMENTS_VIEW_STORAGE_ID } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsTreeViewer';
-import { Extensions, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 import { localize } from 'vscode/vscode/vs/nls';
-import { MarshalledId } from 'vscode/vscode/vs/base/common/marshallingIds';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { revealCommentThread } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsController';
@@ -56,7 +55,6 @@ class MainThreadCommentThread {
     get onDidChangeComments() { return this._onDidChangeComments.event; }
     set range(range) {
         this._range = range;
-        this._onDidChangeRange.fire(this._range);
     }
     get range() {
         return this._range;
@@ -126,8 +124,6 @@ class MainThreadCommentThread {
         this.onDidChangeLabel = this._onDidChangeLabel.event;
         this._onDidChangeComments = ( (new Emitter()));
         this._onDidChangeCanReply = ( (new Emitter()));
-        this._onDidChangeRange = ( (new Emitter()));
-        this.onDidChangeRange = this._onDidChangeRange.event;
         this._onDidChangeCollapsibleState = ( (new Emitter()));
         this.onDidChangeCollapsibleState = this._onDidChangeCollapsibleState.event;
         this._onDidChangeInitialCollapsibleState = ( (new Emitter()));
@@ -183,12 +179,11 @@ class MainThreadCommentThread {
         this._onDidChangeComments.dispose();
         this._onDidChangeInput.dispose();
         this._onDidChangeLabel.dispose();
-        this._onDidChangeRange.dispose();
         this._onDidChangeState.dispose();
     }
     toJSON() {
         return {
-            $mid: MarshalledId.CommentThread,
+            $mid: 7 ,
             commentControlHandle: this.controllerHandle,
             commentThreadHandle: this.commentThreadHandle,
         };
@@ -235,7 +230,11 @@ class MainThreadCommentController {
         this._features = _features;
         this._threads = ( (new Map()));
     }
+    get activeComment() {
+        return this._activeComment;
+    }
     async setActiveCommentAndThread(commentInfo) {
+        this._activeComment = commentInfo;
         return this._proxy.$setActiveComment(this._handle, commentInfo ? { commentThreadHandle: commentInfo.thread.commentThreadHandle, uniqueIdInThread: commentInfo.comment?.uniqueIdInThread } : undefined);
     }
     updateFeatures(features) {
@@ -414,12 +413,12 @@ class MainThreadCommentController {
     }
     toJSON() {
         return {
-            $mid: MarshalledId.CommentController,
+            $mid: 6 ,
             handle: this.handle
         };
     }
 }
-const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(4847, 'View icon of the comments view.')));
+const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(4878, 'View icon of the comments view.')));
 let MainThreadComments = class MainThreadComments extends Disposable {
     constructor(extHostContext, _commentService, _viewsService, _viewDescriptorService, _uriIdentityService, _editorService) {
         super();
@@ -540,7 +539,7 @@ let MainThreadComments = class MainThreadComments extends Disposable {
                 hideIfEmpty: true,
                 icon: commentsViewIcon,
                 order: 10,
-            }, ViewContainerLocation.Panel);
+            }, 1 );
             ( (Registry.as(Extensions.ViewsRegistry))).registerViews([{
                     id: COMMENTS_VIEW_ID,
                     name: COMMENTS_VIEW_TITLE,

package/vscode/src/vs/workbench/api/browser/mainThreadConfiguration.js

@@ -1,12 +1,10 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { getScopes, Extensions, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
-import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { getScopes, Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
 
@@ -43,13 +41,13 @@ let MainThreadConfiguration = class MainThreadConfiguration {
         target = target !== null && target !== undefined ? target : this.deriveConfigurationTarget(key, overrides);
         const configurationValue = this.configurationService.inspect(key, overrides);
         switch (target) {
-            case ConfigurationTarget.MEMORY:
+            case 8 :
                 return this._updateValue(key, value, target, configurationValue?.memory?.override, overrides, scopeToLanguage);
-            case ConfigurationTarget.WORKSPACE_FOLDER:
+            case 6 :
                 return this._updateValue(key, value, target, configurationValue?.workspaceFolder?.override, overrides, scopeToLanguage);
-            case ConfigurationTarget.WORKSPACE:
+            case 5 :
                 return this._updateValue(key, value, target, configurationValue?.workspace?.override, overrides, scopeToLanguage);
-            case ConfigurationTarget.USER_REMOTE:
+            case 4 :
                 return this._updateValue(key, value, target, configurationValue?.userRemote?.override, overrides, scopeToLanguage);
             default:
                 return this._updateValue(key, value, target, configurationValue?.userLocal?.override, overrides, scopeToLanguage);
@@ -63,13 +61,13 @@ let MainThreadConfiguration = class MainThreadConfiguration {
         return this.configurationService.updateValue(key, value, overrides, configurationTarget, { donotNotifyError: true });
     }
     deriveConfigurationTarget(key, overrides) {
-        if (overrides.resource && this._workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
+        if (overrides.resource && this._workspaceContextService.getWorkbenchState() === 3 ) {
             const configurationProperties = ( Registry.as(Extensions.Configuration)).getConfigurationProperties();
-            if (configurationProperties[key] && (configurationProperties[key].scope === ConfigurationScope.RESOURCE || configurationProperties[key].scope === ConfigurationScope.LANGUAGE_OVERRIDABLE)) {
-                return ConfigurationTarget.WORKSPACE_FOLDER;
+            if (configurationProperties[key] && ((configurationProperties[key].scope === 4  || configurationProperties[key].scope === 5) )) {
+                return 6 ;
             }
         }
-        return ConfigurationTarget.WORKSPACE;
+        return 5 ;
     }
 };
 MainThreadConfiguration = __decorate([

package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js

@@ -12,12 +12,10 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
-import { FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { UndoRedoElementType } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
 import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { reviveWebviewExtension } from './mainThreadWebviews.js';
 import { ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
@@ -33,16 +31,11 @@ import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/service
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
 import { ResourceWorkingCopy } from 'vscode/vscode/vs/workbench/services/workingCopy/common/resourceWorkingCopy';
-import { NO_TYPE_ID, WorkingCopyCapabilities } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopy';
+import { NO_TYPE_ID } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopy';
 import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 
 var MainThreadCustomEditorModel_1;
-var CustomEditorModelType;
-( ((function(CustomEditorModelType) {
-    CustomEditorModelType[CustomEditorModelType["Custom"] = 0] = "Custom";
-    CustomEditorModelType[CustomEditorModelType["Text"] = 1] = "Text";
-})(CustomEditorModelType || (CustomEditorModelType = {}))));
 let MainThreadCustomEditors = class MainThreadCustomEditors extends Disposable {
     constructor(context, mainThreadWebview, mainThreadWebviewPanels, extensionService, storageService, workingCopyService, workingCopyFileService, _customEditorService, _editorGroupService, _editorService, _instantiationService, _webviewWorkbenchService) {
         super();
@@ -80,10 +73,10 @@ let MainThreadCustomEditors = class MainThreadCustomEditors extends Disposable {
         this._register(workingCopyFileService.onWillRunWorkingCopyFileOperation(async (e) => this.onWillRunWorkingCopyFileOperation(e)));
     }
     $registerTextEditorProvider(extensionData, viewType, options, capabilities, serializeBuffersForPostMessage) {
-        this.registerEditorProvider(CustomEditorModelType.Text, reviveWebviewExtension(extensionData), viewType, options, capabilities, true, serializeBuffersForPostMessage);
+        this.registerEditorProvider(1 , reviveWebviewExtension(extensionData), viewType, options, capabilities, true, serializeBuffersForPostMessage);
     }
     $registerCustomEditorProvider(extensionData, viewType, options, supportsMultipleEditorsPerDocument, serializeBuffersForPostMessage) {
-        this.registerEditorProvider(CustomEditorModelType.Custom, reviveWebviewExtension(extensionData), viewType, options, {}, supportsMultipleEditorsPerDocument, serializeBuffersForPostMessage);
+        this.registerEditorProvider(0 , reviveWebviewExtension(extensionData), viewType, options, {}, supportsMultipleEditorsPerDocument, serializeBuffersForPostMessage);
     }
     registerEditorProvider(modelType, extension, viewType, options, capabilities, supportsMultipleEditorsPerDocument, serializeBuffersForPostMessage) {
         if (( (this._editorProviders.has(viewType)))) {
@@ -174,12 +167,12 @@ let MainThreadCustomEditors = class MainThreadCustomEditors extends Disposable {
             return existingModel;
         }
         switch (modelType) {
-            case CustomEditorModelType.Text:
+            case 1 :
                 {
                     const model = CustomTextEditorModel.create(this._instantiationService, viewType, resource);
                     return this._customEditorService.models.add(resource, viewType, model);
                 }
-            case CustomEditorModelType.Custom:
+            case 0 :
                 {
                     const model = MainThreadCustomEditorModel.create(this._instantiationService, this._proxyCustomEditors, viewType, resource, options, () => {
                         return Array.from(this.mainThreadWebviewPanels.webviewInputs)
@@ -206,7 +199,7 @@ let MainThreadCustomEditors = class MainThreadCustomEditors extends Disposable {
         return model;
     }
     async onWillRunWorkingCopyFileOperation(e) {
-        if (e.operation !== FileOperation.MOVE) {
+        if (e.operation !== 2 ) {
             return;
         }
         e.waitUntil((async () => {
@@ -240,18 +233,17 @@ MainThreadCustomEditors = ( (__decorate([
 ], MainThreadCustomEditors)));
 var HotExitState;
 ( ((function(HotExitState) {
-    let Type;
     ( ((function(Type) {
         Type[Type["Allowed"] = 0] = "Allowed";
         Type[Type["NotAllowed"] = 1] = "NotAllowed";
         Type[Type["Pending"] = 2] = "Pending";
-    })(Type = HotExitState.Type || (HotExitState.Type = {}))));
-    HotExitState.Allowed = ( (Object.freeze({ type: Type.Allowed })));
-    HotExitState.NotAllowed = ( (Object.freeze({ type: Type.NotAllowed })));
+    })(HotExitState.Type || (HotExitState.Type = {}))));
+    HotExitState.Allowed = ( (Object.freeze({ type: 0  })));
+    HotExitState.NotAllowed = ( (Object.freeze({ type: 1  })));
     class Pending {
         constructor(operation) {
             this.operation = operation;
-            this.type = Type.Pending;
+            this.type = 2 ;
         }
     }
     HotExitState.Pending = Pending;
@@ -296,16 +288,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         if (_editable) {
             this._register(workingCopyService.registerWorkingCopy(this));
             this._register(extensionService.onWillStop(e => {
-                if (!this.isDirty()) {
-                    return;
-                }
-                e.veto((async () => {
-                    const didSave = await this.save();
-                    if (!didSave) {
-                        return true;
-                    }
-                    return false;
-                })(), ( localize(9861, "Custom editor '{0}' could not be saved.", this.name)));
+                e.veto(true, ( localize(9956, "A custom editor for '{0}' is open.", this.name)));
             }));
         }
         if (startDirty) {
@@ -338,7 +321,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         return basename(this._labelService.getUriLabel(this._editorResource));
     }
     get capabilities() {
-        return this.isUntitled() ? WorkingCopyCapabilities.Untitled : WorkingCopyCapabilities.None;
+        return this.isUntitled() ? 2  : 0 ;
     }
     isDirty() {
         if (this._isDirtyFromContentChange) {
@@ -370,9 +353,9 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
             this._currentEditIndex = this._edits.length - 1;
         });
         this._undoService.pushElement({
-            type: UndoRedoElementType.Resource,
+            type: 0 ,
             resource: this._editorResource,
-            label: label ?? ( localize(9862, "Edit")),
+            label: label ?? ( localize(9957, "Edit")),
             code: 'undoredo.customEditorEdit',
             undo: () => this.undo(),
             redo: () => this.redo(),
@@ -504,7 +487,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
             return true;
         }
     }
-    get canHotExit() { return typeof this._backupId === 'string' && this._hotExitState.type === HotExitState.Type.Allowed; }
+    get canHotExit() { return typeof this._backupId === 'string' && this._hotExitState.type === 0 ; }
     async backup(token) {
         const editors = this._getEditors();
         if (!editors.length) {
@@ -531,7 +514,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         if (!this._editable) {
             return backupData;
         }
-        if (this._hotExitState.type === HotExitState.Type.Pending) {
+        if (this._hotExitState.type === 2 ) {
             this._hotExitState.operation.cancel();
         }
         const pendingState = new HotExitState.Pending(createCancelablePromise(token => this._proxy.$backup(this._editorResource.toJSON(), this.viewType, token)));

package/vscode/src/vs/workbench/api/browser/mainThreadDebugService.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { DisposableStore, DisposableMap, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { IDebugVisualization, DataBreakpointSetType } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { IDebugVisualization } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -28,7 +28,7 @@ let MainThreadDebugService = class MainThreadDebugService {
         this._toDispose.add(debugService.onDidNewSession(session => {
             this._proxy.$acceptDebugSessionStarted(this.getSessionDto(session));
             const store = sessionListeners.get(session);
-            store.add(session.onDidChangeName(name => {
+            store?.add(session.onDidChangeName(name => {
                 this._proxy.$acceptDebugSessionNameChanged(this.getSessionDto(session), name);
             }));
         }));
@@ -190,7 +190,7 @@ let MainThreadDebugService = class MainThreadDebugService {
             else if (dto.type === 'data') {
                 this.debugService.addDataBreakpoint({
                     description: dto.label,
-                    src: { type: DataBreakpointSetType.Variable, dataId: dto.dataId },
+                    src: { type: 0 , dataId: dto.dataId },
                     canPersist: dto.canPersist,
                     accessTypes: dto.accessTypes,
                     accessType: dto.accessType,
@@ -384,7 +384,7 @@ let MainThreadDebugService = class MainThreadDebugService {
                 return {
                     type: 'data',
                     id: dbp.getId(),
-                    dataId: dbp.src.type === DataBreakpointSetType.Variable ? dbp.src.dataId : dbp.src.address,
+                    dataId: dbp.src.type === 0  ? dbp.src.dataId : dbp.src.address,
                     enabled: dbp.enabled,
                     condition: dbp.condition,
                     hitCondition: dbp.hitCondition,

package/vscode/src/vs/workbench/api/browser/mainThreadDocuments.js

@@ -6,7 +6,6 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { shouldSynchronizeModel } from 'vscode/vscode/vs/editor/common/model';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
-import { FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
@@ -114,8 +113,8 @@ let MainThreadDocuments = class MainThreadDocuments extends Disposable {
             }
         }));
         this._store.add(workingCopyFileService.onDidRunWorkingCopyFileOperation(e => {
-            const isMove = e.operation === FileOperation.MOVE;
-            if (isMove || e.operation === FileOperation.DELETE) {
+            const isMove = e.operation === 2 ;
+            if (isMove || e.operation === 1 ) {
                 for (const pair of e.files) {
                     const removed = isMove ? pair.source : pair.target;
                     if (removed) {

package/vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js

@@ -24,7 +24,6 @@ import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/cl
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
 import { diffSets, diffMaps } from 'vscode/vscode/vs/base/common/collections';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
-import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 
 class TextEditorSnapshot {
@@ -81,11 +80,6 @@ class DocumentAndEditorState {
         this.activeEditor = activeEditor;
     }
 }
-var ActiveEditorOrder;
-( (function(ActiveEditorOrder) {
-    ActiveEditorOrder[ActiveEditorOrder["Editor"] = 0] = "Editor";
-    ActiveEditorOrder[ActiveEditorOrder["Panel"] = 1] = "Panel";
-})(ActiveEditorOrder || (ActiveEditorOrder = {})));
 let MainThreadDocumentAndEditorStateComputer = class MainThreadDocumentAndEditorStateComputer {
     constructor(_onDidChangeState, _modelService, _codeEditorService, _editorService, _paneCompositeService) {
         this._onDidChangeState = _onDidChangeState;
@@ -95,16 +89,16 @@ let MainThreadDocumentAndEditorStateComputer = class MainThreadDocumentAndEditor
         this._paneCompositeService = _paneCompositeService;
         this._toDispose = ( new DisposableStore());
         this._toDisposeOnEditorRemove = ( new DisposableMap());
-        this._activeEditorOrder = ActiveEditorOrder.Editor;
+        this._activeEditorOrder = 0 ;
         this._modelService.onModelAdded(this._updateStateOnModelAdd, this, this._toDispose);
         this._modelService.onModelRemoved(_ => this._updateState(), this, this._toDispose);
         this._editorService.onDidActiveEditorChange(_ => this._updateState(), this, this._toDispose);
         this._codeEditorService.onCodeEditorAdd(this._onDidAddEditor, this, this._toDispose);
         this._codeEditorService.onCodeEditorRemove(this._onDidRemoveEditor, this, this._toDispose);
         this._codeEditorService.listCodeEditors().forEach(this._onDidAddEditor, this);
-        Event.filter(this._paneCompositeService.onDidPaneCompositeOpen, event => event.viewContainerLocation === ViewContainerLocation.Panel)(_ => this._activeEditorOrder = ActiveEditorOrder.Panel, undefined, this._toDispose);
-        Event.filter(this._paneCompositeService.onDidPaneCompositeClose, event => event.viewContainerLocation === ViewContainerLocation.Panel)(_ => this._activeEditorOrder = ActiveEditorOrder.Editor, undefined, this._toDispose);
-        this._editorService.onDidVisibleEditorsChange(_ => this._activeEditorOrder = ActiveEditorOrder.Editor, undefined, this._toDispose);
+        Event.filter(this._paneCompositeService.onDidPaneCompositeOpen, event => event.viewContainerLocation === 1 )(_ => this._activeEditorOrder = 1 , undefined, this._toDispose);
+        Event.filter(this._paneCompositeService.onDidPaneCompositeClose, event => event.viewContainerLocation === 1 )(_ => this._activeEditorOrder = 0 , undefined, this._toDispose);
+        this._editorService.onDidVisibleEditorsChange(_ => this._activeEditorOrder = 0 , undefined, this._toDispose);
         this._updateState();
     }
     dispose() {
@@ -164,7 +158,7 @@ let MainThreadDocumentAndEditorStateComputer = class MainThreadDocumentAndEditor
         }
         if (!activeEditor) {
             let candidate;
-            if (this._activeEditorOrder === ActiveEditorOrder.Editor) {
+            if (this._activeEditorOrder === 0 ) {
                 candidate = this._getActiveEditorFromEditorPart() || this._getActiveEditorFromPanel();
             }
             else {
@@ -186,7 +180,7 @@ let MainThreadDocumentAndEditorStateComputer = class MainThreadDocumentAndEditor
         }
     }
     _getActiveEditorFromPanel() {
-        const panel = this._paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel);
+        const panel = this._paneCompositeService.getActivePaneComposite(1 );
         if (panel instanceof FakeAbstractTextEditor) {
             const control = panel.getControl();
             if (isCodeEditor(control)) {

package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js

@@ -13,7 +13,7 @@ class ExtHostEditSessionIdentityCreateParticipant {
     }
     async participate(workspaceFolder, token) {
         const p = ( (new Promise((resolve, reject) => {
-            setTimeout(() => reject(( (new Error(( localize(4839, "Aborted onWillCreateEditSessionIdentity-event after 10000ms")))))), this.timeout);
+            setTimeout(() => reject(( (new Error(( localize(4870, "Aborted onWillCreateEditSessionIdentity-event after 10000ms")))))), this.timeout);
             this._proxy.$onWillCreateEditSessionIdentity(workspaceFolder.uri, token, this.timeout).then(resolve, reject);
         })));
         return raceCancellationError(p, token);

package/vscode/src/vs/workbench/api/browser/mainThreadEditor.js

@@ -1,13 +1,12 @@
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { EditorOption, TextEditorCursorStyle, RenderLineNumbersType, cursorStyleToString } from 'vscode/vscode/vs/editor/common/config/editorOptions';
+import { TextEditorCursorStyle, cursorStyleToString } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { Selection } from 'vscode/vscode/vs/editor/common/core/selection';
-import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { SnippetController2 } from 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
 import { TextEditorRevealType } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { equals } from 'vscode/vscode/vs/base/common/arrays';
-import { EditorState, CodeEditorStateFlag } from 'vscode/vscode/vs/editor/contrib/editorState/browser/editorState';
+import { EditorState } from 'vscode/vscode/vs/editor/contrib/editorState/browser/editorState';
 import { SnippetParser } from 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetParser';
 
 class MainThreadTextEditorProperties {
@@ -43,8 +42,8 @@ class MainThreadTextEditorProperties {
         let lineNumbers;
         if (codeEditor) {
             const options = codeEditor.getOptions();
-            const lineNumbersOpts = options.get(EditorOption.lineNumbers);
-            cursorStyle = options.get(EditorOption.cursorStyle);
+            const lineNumbersOpts = options.get(70 );
+            cursorStyle = options.get(28 );
             lineNumbers = lineNumbersOpts.renderType;
         }
         else if (previousProperties) {
@@ -53,7 +52,7 @@ class MainThreadTextEditorProperties {
         }
         else {
             cursorStyle = TextEditorCursorStyle.Line;
-            lineNumbers = RenderLineNumbersType.On;
+            lineNumbers = 1 ;
         }
         const modelOptions = model.getOptions();
         return {
@@ -285,13 +284,13 @@ class MainThreadTextEditor {
         if (typeof newConfiguration.lineNumbers !== 'undefined') {
             let lineNumbers;
             switch (newConfiguration.lineNumbers) {
-                case RenderLineNumbersType.On:
+                case 1 :
                     lineNumbers = 'on';
                     break;
-                case RenderLineNumbersType.Relative:
+                case 2 :
                     lineNumbers = 'relative';
                     break;
-                case RenderLineNumbersType.Interval:
+                case 3 :
                     lineNumbers = 'interval';
                     break;
                 default:
@@ -324,16 +323,16 @@ class MainThreadTextEditor {
         }
         switch (revealType) {
             case TextEditorRevealType.Default:
-                this._codeEditor.revealRange(range, ScrollType.Smooth);
+                this._codeEditor.revealRange(range, 0 );
                 break;
             case TextEditorRevealType.InCenter:
-                this._codeEditor.revealRangeInCenter(range, ScrollType.Smooth);
+                this._codeEditor.revealRangeInCenter(range, 0 );
                 break;
             case TextEditorRevealType.InCenterIfOutsideViewport:
-                this._codeEditor.revealRangeInCenterIfOutsideViewport(range, ScrollType.Smooth);
+                this._codeEditor.revealRangeInCenterIfOutsideViewport(range, 0 );
                 break;
             case TextEditorRevealType.AtTop:
-                this._codeEditor.revealRangeAtTop(range, ScrollType.Smooth);
+                this._codeEditor.revealRangeAtTop(range, 0 );
                 break;
             default:
                 console.warn(`Unknown revealType: ${revealType}`);
@@ -385,7 +384,10 @@ class MainThreadTextEditor {
         let clipboardText;
         const needsTemplate = SnippetParser.guessNeedsClipboard(template);
         if (needsTemplate) {
-            const state = ( new EditorState(this._codeEditor, CodeEditorStateFlag.Value | CodeEditorStateFlag.Position));
+            const state = ( new EditorState(
+                this._codeEditor,
+                1  | 4
+            ));
             clipboardText = await this._clipboardService.readText();
             if (!state.validate(this._codeEditor)) {
                 return false;