@codingame/monaco-vscode-extensions-service-override 2.1.3 → 2.2.0-next.1

package/extensions.js

@@ -38,6 +38,9 @@ import { CustomSchemas } from '@codingame/monaco-vscode-files-service-override';
 import { registerAssets } from 'vscode/assets';
 import 'vscode/vscode/vs/workbench/services/themes/common/colorExtensionPoint';
 import 'vscode/vscode/vs/workbench/services/themes/common/iconExtensionPoint';
+import 'vscode/vscode/vs/nls';
+import 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
+import 'vscode/vscode/vs/platform/theme/common/tokenClassificationRegistry';
 import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint';
 import 'vscode/vscode/vs/workbench/api/browser/statusBarExtensionPoint';
 import './vscode/src/vs/workbench/api/browser/mainThreadLocalization.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "2.1.3",
+  "version": "2.2.0-next.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,9 +18,9 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.1.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.2.0-next.1",
     "vscode-marked": "npm:marked@=3.0.2",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-files-service-override": "2.1.3"
+    "@codingame/monaco-vscode-files-service-override": "2.2.0-next.1"
   }
 }

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

@@ -6,9 +6,9 @@ import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentService';
-import { CommentsPanel } from '../../contrib/comments/browser/commentsView.js';
+import { CommentsPanel } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsView';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { COMMENTS_VIEW_ID, COMMENTS_VIEW_TITLE, COMMENTS_VIEW_STORAGE_ID } from '../../contrib/comments/browser/commentsTreeViewer.js';
+import { COMMENTS_VIEW_ID, COMMENTS_VIEW_TITLE, COMMENTS_VIEW_STORAGE_ID } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsTreeViewer';
 import { IViewDescriptorService, Extensions } from 'vscode/vscode/vs/workbench/common/views';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';

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

@@ -17,7 +17,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { SideBySideEditorInput } from 'vscode/vscode/vs/workbench/common/editor/sideBySideEditorInput';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { isGroupEditorMoveEvent } from 'vscode/vscode/vs/workbench/common/editor/editorGroupModel';
-import { InteractiveEditorInput } from '../../contrib/interactive/browser/interactiveEditorInput.js';
+import { InteractiveEditorInput } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
 import { MergeEditorInput } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';

package/vscode/src/vs/workbench/services/extensions/browser/extensionService.js

@@ -5,7 +5,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { getLogs } from '../../../../platform/log/browser/log.js';
+import { getLogs } from 'vscode/vscode/vs/platform/log/browser/log';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';

package/external/rollup-plugin-styles/dist/runtime/inject-css.js

@@ -1,3 +0,0 @@
-var e=[],t=[];function n(n,r){if(n&&"undefined"!=typeof document){var a,s=!0===r.prepend?"prepend":"append",d=!0===r.singleTag,i="string"==typeof r.container?document.querySelector(r.container):document.getElementsByTagName("head")[0];if(d){var u=e.indexOf(i);-1===u&&(u=e.push(i)-1,t[u]={}),a=t[u]&&t[u][s]?t[u][s]:t[u][s]=c();}else a=c();65279===n.charCodeAt(0)&&(n=n.substring(1)),a.styleSheet?a.styleSheet.cssText+=n:a.appendChild(document.createTextNode(n));}function c(){var e=document.createElement("style");if(e.setAttribute("type","text/css"),r.attributes)for(var t=( Object.keys(r.attributes)),n=0;n<t.length;n++)e.setAttribute(t[n],r.attributes[t[n]]);var a="prepend"===s?"afterbegin":"beforeend";return i.insertAdjacentElement(a,e),e}}
-
-export { n as default };

package/vscode/src/vs/platform/log/browser/log.js

@@ -1,26 +0,0 @@
-import { relativePath } from 'vscode/vscode/vs/base/common/resources';
-
-async function getLogs(fileService, environmentService) {
-    const result = [];
-    await doGetLogs(fileService, result, environmentService.logsHome, environmentService.logsHome);
-    return result;
-}
-async function doGetLogs(fileService, logs, curFolder, logsHome) {
-    const stat = await fileService.resolve(curFolder);
-    for (const { resource, isDirectory } of stat.children || []) {
-        if (isDirectory) {
-            await doGetLogs(fileService, logs, resource, logsHome);
-        }
-        else {
-            const contents = ( (await fileService.readFile(resource)).value.toString());
-            if (contents) {
-                const path = relativePath(logsHome, resource);
-                if (path) {
-                    logs.push({ relativePath: path, contents });
-                }
-            }
-        }
-    }
-}
-
-export { getLogs };

package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js

@@ -1,92 +0,0 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { Color } from 'vscode/vscode/vs/base/common/color';
-import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
-import { ModelDecorationOptions } from 'vscode/vscode/vs/editor/common/model/textModel';
-import { registerColor, opaque, listInactiveSelectionBackground, editorBackground, darken, editorForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
-import { themeColorFromId } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { CommentThreadState } from 'vscode/vscode/vs/editor/common/languages';
-
-const overviewRulerCommentingRangeForeground = registerColor('editorGutter.commentRangeForeground', { dark: opaque(listInactiveSelectionBackground, editorBackground), light: ( darken(opaque(listInactiveSelectionBackground, editorBackground), .05)), hcDark: Color.white, hcLight: Color.black }, ( localizeWithPath(
-    'vs/workbench/contrib/comments/browser/commentGlyphWidget',
-    'editorGutterCommentRangeForeground',
-    'Editor gutter decoration color for commenting ranges. This color should be opaque.'
-)));
-const overviewRulerCommentForeground = registerColor('editorOverviewRuler.commentForeground', { dark: overviewRulerCommentingRangeForeground, light: overviewRulerCommentingRangeForeground, hcDark: overviewRulerCommentingRangeForeground, hcLight: overviewRulerCommentingRangeForeground }, ( localizeWithPath(
-    'vs/workbench/contrib/comments/browser/commentGlyphWidget',
-    'editorOverviewRuler.commentForeground',
-    'Editor overview ruler decoration color for resolved comments. This color should be opaque.'
-)));
-const overviewRulerCommentUnresolvedForeground = registerColor('editorOverviewRuler.commentUnresolvedForeground', { dark: overviewRulerCommentForeground, light: overviewRulerCommentForeground, hcDark: overviewRulerCommentForeground, hcLight: overviewRulerCommentForeground }, ( localizeWithPath(
-    'vs/workbench/contrib/comments/browser/commentGlyphWidget',
-    'editorOverviewRuler.commentUnresolvedForeground',
-    'Editor overview ruler decoration color for unresolved comments. This color should be opaque.'
-)));
-const editorGutterCommentGlyphForeground = registerColor('editorGutter.commentGlyphForeground', { dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white }, ( localizeWithPath(
-    'vs/workbench/contrib/comments/browser/commentGlyphWidget',
-    'editorGutterCommentGlyphForeground',
-    'Editor gutter decoration color for commenting glyphs.'
-)));
-registerColor('editorGutter.commentUnresolvedGlyphForeground', { dark: editorGutterCommentGlyphForeground, light: editorGutterCommentGlyphForeground, hcDark: editorGutterCommentGlyphForeground, hcLight: editorGutterCommentGlyphForeground }, ( localizeWithPath(
-    'vs/workbench/contrib/comments/browser/commentGlyphWidget',
-    'editorGutterCommentUnresolvedGlyphForeground',
-    'Editor gutter decoration color for commenting glyphs for unresolved comment threads.'
-)));
-class CommentGlyphWidget {
-    static { this.description = 'comment-glyph-widget'; }
-    constructor(editor, lineNumber) {
-        this._commentsOptions = this.createDecorationOptions();
-        this._editor = editor;
-        this._commentsDecorations = this._editor.createDecorationsCollection();
-        this.setLineNumber(lineNumber);
-    }
-    createDecorationOptions() {
-        const unresolved = this._threadState === CommentThreadState.Unresolved;
-        const decorationOptions = {
-            description: CommentGlyphWidget.description,
-            isWholeLine: true,
-            overviewRuler: {
-                color: themeColorFromId(unresolved ? overviewRulerCommentUnresolvedForeground : overviewRulerCommentForeground),
-                position: OverviewRulerLane.Center
-            },
-            collapseOnReplaceEdit: true,
-            linesDecorationsClassName: `comment-range-glyph comment-thread${unresolved ? '-unresolved' : ''}`
-        };
-        return ModelDecorationOptions.createDynamic(decorationOptions);
-    }
-    setThreadState(state) {
-        if (this._threadState !== state) {
-            this._threadState = state;
-            this._commentsOptions = this.createDecorationOptions();
-            this._updateDecorations();
-        }
-    }
-    _updateDecorations() {
-        const commentsDecorations = [{
-                range: {
-                    startLineNumber: this._lineNumber, startColumn: 1,
-                    endLineNumber: this._lineNumber, endColumn: 1
-                },
-                options: this._commentsOptions
-            }];
-        this._commentsDecorations.set(commentsDecorations);
-    }
-    setLineNumber(lineNumber) {
-        this._lineNumber = lineNumber;
-        this._updateDecorations();
-    }
-    getPosition() {
-        const range = (this._commentsDecorations.length > 0 ? this._commentsDecorations.getRange(0) : null);
-        return {
-            position: {
-                lineNumber: range ? range.endLineNumber : this._lineNumber,
-                column: 1
-            },
-            preference: [0 ]
-        };
-    }
-    dispose() {
-        this._commentsDecorations.clear();
-    }
-}
-
-export { CommentGlyphWidget, overviewRulerCommentingRangeForeground };

package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadRangeDecorator.js

@@ -1,109 +0,0 @@
-import { Disposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
-import { CommentThreadCollapsibleState } from 'vscode/vscode/vs/editor/common/languages';
-import { ModelDecorationOptions } from 'vscode/vscode/vs/editor/common/model/textModel';
-
-class CommentThreadRangeDecoration {
-    get id() {
-        return this._decorationId;
-    }
-    set id(id) {
-        this._decorationId = id;
-    }
-    constructor(range, options) {
-        this.range = range;
-        this.options = options;
-    }
-}
-class CommentThreadRangeDecorator extends Disposable {
-    static { this.description = 'comment-thread-range-decorator'; }
-    constructor(commentService) {
-        super();
-        this.decorationIds = [];
-        this.activeDecorationIds = [];
-        this.threadCollapseStateListeners = [];
-        const decorationOptions = {
-            description: CommentThreadRangeDecorator.description,
-            isWholeLine: false,
-            zIndex: 20,
-            className: 'comment-thread-range',
-            shouldFillLineOnLineBreak: true
-        };
-        this.decorationOptions = ModelDecorationOptions.createDynamic(decorationOptions);
-        const activeDecorationOptions = {
-            description: CommentThreadRangeDecorator.description,
-            isWholeLine: false,
-            zIndex: 20,
-            className: 'comment-thread-range-current',
-            shouldFillLineOnLineBreak: true
-        };
-        this.activeDecorationOptions = ModelDecorationOptions.createDynamic(activeDecorationOptions);
-        this._register(commentService.onDidChangeCurrentCommentThread(thread => {
-            this.updateCurrent(thread);
-        }));
-        this._register(commentService.onDidUpdateCommentThreads(() => {
-            this.updateCurrent(undefined);
-        }));
-    }
-    updateCurrent(thread) {
-        if (!this.editor || (thread?.resource && (thread.resource?.toString() !== this.editor.getModel()?.uri.toString()))) {
-            return;
-        }
-        this.currentThreadCollapseStateListener?.dispose();
-        const newDecoration = [];
-        if (thread) {
-            const range = thread.range;
-            if (range && !((range.startLineNumber === range.endLineNumber) && (range.startColumn === range.endColumn))) {
-                if (thread.collapsibleState === CommentThreadCollapsibleState.Expanded) {
-                    this.currentThreadCollapseStateListener = thread.onDidChangeCollapsibleState(state => {
-                        if (state === CommentThreadCollapsibleState.Collapsed) {
-                            this.updateCurrent(undefined);
-                        }
-                    });
-                    newDecoration.push(( new CommentThreadRangeDecoration(range, this.activeDecorationOptions)));
-                }
-            }
-        }
-        this.editor.changeDecorations((changeAccessor) => {
-            this.activeDecorationIds = changeAccessor.deltaDecorations(this.activeDecorationIds, newDecoration);
-            newDecoration.forEach((decoration, index) => decoration.id = this.decorationIds[index]);
-        });
-    }
-    update(editor, commentInfos) {
-        const model = editor?.getModel();
-        if (!editor || !model) {
-            return;
-        }
-        dispose(this.threadCollapseStateListeners);
-        this.editor = editor;
-        const commentThreadRangeDecorations = [];
-        for (const info of commentInfos) {
-            info.threads.forEach(thread => {
-                if (thread.isDisposed) {
-                    return;
-                }
-                const range = thread.range;
-                if (!range || (range.startLineNumber === range.endLineNumber) && (range.startColumn === range.endColumn)) {
-                    return;
-                }
-                this.threadCollapseStateListeners.push(thread.onDidChangeCollapsibleState(() => {
-                    this.update(editor, commentInfos);
-                }));
-                if (thread.collapsibleState === CommentThreadCollapsibleState.Collapsed) {
-                    return;
-                }
-                commentThreadRangeDecorations.push(( new CommentThreadRangeDecoration(range, this.decorationOptions)));
-            });
-        }
-        editor.changeDecorations((changeAccessor) => {
-            this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, commentThreadRangeDecorations);
-            commentThreadRangeDecorations.forEach((decoration, index) => decoration.id = this.decorationIds[index]);
-        });
-    }
-    dispose() {
-        dispose(this.threadCollapseStateListeners);
-        this.currentThreadCollapseStateListener?.dispose();
-        super.dispose();
-    }
-}
-
-export { CommentThreadRangeDecorator };