@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js

@@ -10,7 +10,7 @@ import { derivedWithStore, derived } from '../../../../base/common/observableInt
 import { autorunWithStore, autorun } from '../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
-import { Scrollable } from '../../../../base/common/scrollable.js';
+import { Scrollable, ScrollbarVisibility } from '../../../../base/common/scrollable.js';
 import './style.css.js';
 import { ObservableElementSizeObserver } from '../diffEditor/utils.js';
 import { OffsetRange } from '../../../common/core/offsetRange.js';
@@ -21,6 +21,8 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { DiffEditorItemTemplate, TemplateData } from './diffEditorItemTemplate.js';
 import { ObjectPool } from './objectPool.js';
+import { localizeWithPath } from '../../../../nls.js';
+const _moduleId = "vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl";
 let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposable {
     constructor(_element, _dimension, _viewModel, _workbenchUIElementFactory, _parentContextKeyService, _parentInstantiationService) {
         super();
@@ -30,7 +32,7 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
         this._workbenchUIElementFactory = _workbenchUIElementFactory;
         this._parentContextKeyService = _parentContextKeyService;
         this._parentInstantiationService = _parentInstantiationService;
-        this._elements = h('div.monaco-component.multiDiffEditor', [
+        this._scrollableElements = h('div.scrollContent', [
             h('div@content', {
                 style: {
                     overflow: 'hidden',
@@ -38,35 +40,39 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
             }),
             h('div.monaco-editor@overflowWidgetsDomNode', {}),
         ]);
-        this._sizeObserver = this._register(( new ObservableElementSizeObserver(this._element, undefined)));
-        this._objectPool = this._register(( new ObjectPool((data) => {
-            const template = this._instantiationService.createInstance(DiffEditorItemTemplate, this._elements.content, this._elements.overflowWidgetsDomNode, this._workbenchUIElementFactory);
-            template.setData(data);
-            return template;
-        })));
-        this._scrollable = this._register(( new Scrollable({
+        this._scrollable = this._register(( (new Scrollable({
             forceIntegerValues: false,
             scheduleAtNextAnimationFrame: (cb) => scheduleAtNextAnimationFrame(getWindow(this._element), cb),
             smoothScrollDuration: 100,
-        })));
-        this._scrollableElement = this._register(( new SmoothScrollableElement(this._elements.root, {
-            vertical: 1 ,
-            horizontal: 1 ,
+        }))));
+        this._scrollableElement = this._register(( (new SmoothScrollableElement(this._scrollableElements.root, {
+            vertical: ScrollbarVisibility.Auto,
+            horizontal: ScrollbarVisibility.Auto,
             useShadows: false,
-        }, this._scrollable)));
+        }, this._scrollable))));
+        this._elements = h('div.monaco-component.multiDiffEditor', {}, [
+            h('div', {}, [this._scrollableElement.getDomNode()]),
+            h('div.placeholder@placeholder', {}, [h('div', [( localizeWithPath(_moduleId, 0, 'No Changed Files'))])]),
+        ]);
+        this._sizeObserver = this._register(( (new ObservableElementSizeObserver(this._element, undefined))));
+        this._objectPool = this._register(( (new ObjectPool((data) => {
+            const template = this._instantiationService.createInstance(DiffEditorItemTemplate, this._scrollableElements.content, this._scrollableElements.overflowWidgetsDomNode, this._workbenchUIElementFactory);
+            template.setData(data);
+            return template;
+        }))));
         this.scrollTop = observableFromEvent(this._scrollableElement.onScroll, () =>  this._scrollableElement.getScrollPosition().scrollTop);
         this.scrollLeft = observableFromEvent(this._scrollableElement.onScroll, () =>  this._scrollableElement.getScrollPosition().scrollLeft);
         this._viewItemsInfo = derivedWithStore(this, (reader, store) => {
             const vm = this._viewModel.read(reader);
             if (!vm) {
-                return { items: [], getItem: _d => { throw ( new BugIndicatingError()); } };
+                return { items: [], getItem: _d => { throw ( (new BugIndicatingError())); } };
             }
             const viewModels = vm.items.read(reader);
-            const map = ( new Map());
-            const items = ( viewModels.map(d => {
-                const item = store.add(( new VirtualizedViewItem(d, this._objectPool, this.scrollLeft, delta => {
+            const map = ( (new Map()));
+            const items = ( (viewModels.map(d => {
+                const item = store.add(( (new VirtualizedViewItem(d, this._objectPool, this.scrollLeft, delta => {
                     this._scrollableElement.setScrollPosition({ scrollTop: this._scrollableElement.getScrollPosition().scrollTop + delta });
-                })));
+                }))));
                 const data = this._lastDocStates?.[item.getKey()];
                 if (data) {
                     transaction(tx => {
@@ -75,15 +81,15 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
                 }
                 map.set(d, item);
                 return item;
-            }));
+            })));
             return { items, getItem: d => map.get(d) };
         });
-        this._viewItems = ( this._viewItemsInfo.map(this, items => items.items));
+        this._viewItems = ( (this._viewItemsInfo.map(this, items => items.items)));
         this._spaceBetweenPx = 0;
-        this._totalHeight = ( this._viewItems.map(
+        this._totalHeight = ( (this._viewItems.map(
             this,
             (items, reader) => items.reduce((r, i) => r + i.contentHeight.read(reader) + this._spaceBetweenPx, 0)
-        ));
+        )));
         this.activeControl = derived(this, reader => {
             const activeDiffItem = this._viewModel.read(reader)?.activeDiffItem.read(reader);
             if (!activeDiffItem) {
@@ -93,7 +99,7 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
             return viewItem.template.read(reader)?.editor;
         });
         this._contextKeyService = this._register(this._parentContextKeyService.createScoped(this._element));
-        this._instantiationService = this._parentInstantiationService.createChild(( new ServiceCollection([IContextKeyService, this._contextKeyService])));
+        this._instantiationService = this._register(this._parentInstantiationService.createChild(( (new ServiceCollection([IContextKeyService, this._contextKeyService])))));
         this._lastDocStates = {};
         this._contextKeyService.createKey(EditorContextKeys.inMultiDiffEditor.key, true);
         this._register(autorunWithStore((reader, store) => {
@@ -118,12 +124,16 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
             const dimension = this._dimension.read(reader);
             this._sizeObserver.observe(dimension);
         }));
-        this._elements.content.style.position = 'relative';
+        this._register(autorun((reader) => {
+            const items = this._viewItems.read(reader);
+            this._elements.placeholder.classList.toggle('visible', items.length === 0);
+        }));
+        this._scrollableElements.content.style.position = 'relative';
         this._register(autorun((reader) => {
             const height = this._sizeObserver.height.read(reader);
-            this._elements.root.style.height = `${height}px`;
+            this._scrollableElements.root.style.height = `${height}px`;
             const totalHeight = this._totalHeight.read(reader);
-            this._elements.content.style.height = `${totalHeight}px`;
+            this._scrollableElements.content.style.height = `${totalHeight}px`;
             const width = this._sizeObserver.width.read(reader);
             let scrollWidth = width;
             const viewItems = this._viewItems.read(reader);
@@ -139,7 +149,7 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
                 scrollWidth,
             });
         }));
-        _element.replaceChildren(this._scrollableElement.getDomNode());
+        _element.replaceChildren(this._elements.root);
         this._register(toDisposable(() => {
             _element.replaceChildren();
         }));
@@ -157,7 +167,7 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
         const index = viewItems.findIndex((item) => item.viewModel.originalUri?.toString() === resource.original?.toString()
             && item.viewModel.modifiedUri?.toString() === resource.modified?.toString());
         if (index === -1) {
-            throw ( new BugIndicatingError('Resource not found in diff editor'));
+            throw ( (new BugIndicatingError('Resource not found in diff editor')));
         }
         const viewItem = viewItems[index];
         this._viewModel.get().activeDiffItem.setCache(viewItem.viewModel, undefined);
@@ -179,7 +189,7 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
                 top: this.scrollTop.get(),
                 left: this.scrollLeft.get(),
             },
-            docStates: Object.fromEntries(( this._viewItems.get().map(i => [i.getKey(), i.getViewState()]))),
+            docStates: Object.fromEntries(( (this._viewItems.get().map(i => [i.getKey(), i.getViewState()])))),
         };
     }
     setViewState(viewState) {
@@ -197,13 +207,13 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
         });
     }
     tryGetCodeEditor(resource) {
-        const item = this._viewItems.get().find(v => ( v.viewModel.diffEditorViewModel.model.modified.uri.toString()) === ( resource.toString())
-            || ( v.viewModel.diffEditorViewModel.model.original.uri.toString()) === ( resource.toString()));
+        const item = this._viewItems.get().find(v => ( (v.viewModel.diffEditorViewModel.model.modified.uri.toString())) === ( (resource.toString()))
+            || ( (v.viewModel.diffEditorViewModel.model.original.uri.toString())) === ( (resource.toString())));
         const editor = item?.template.get()?.editor;
         if (!editor) {
             return undefined;
         }
-        if (( item.viewModel.diffEditorViewModel.model.modified.uri.toString()) === ( resource.toString())) {
+        if (( (item.viewModel.diffEditorViewModel.model.modified.uri.toString())) === ( (resource.toString()))) {
             return { diffEditor: editor, editor: editor.getModifiedEditor() };
         }
         else {
@@ -239,13 +249,13 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
             itemHeightSumBefore += itemHeight + this._spaceBetweenPx;
             itemContentHeightSumBefore += itemContentHeight + this._spaceBetweenPx;
         }
-        this._elements.content.style.transform = `translateY(${-(scrollTop + contentScrollOffsetToScrollOffset)}px)`;
+        this._scrollableElements.content.style.transform = `translateY(${-(scrollTop + contentScrollOffsetToScrollOffset)}px)`;
     }
 };
-MultiDiffEditorWidgetImpl = ( __decorate([
-    ( __param(4, IContextKeyService)),
-    ( __param(5, IInstantiationService))
-], MultiDiffEditorWidgetImpl));
+MultiDiffEditorWidgetImpl = ( (__decorate([
+    ( (__param(4, IContextKeyService))),
+    ( (__param(5, IInstantiationService)))
+], MultiDiffEditorWidgetImpl)));
 function highlightRange(targetEditor, range) {
     const modelNow = targetEditor.getModel();
     const decorations = targetEditor.createDecorationsCollection([{ range, options: { description: 'symbol-navigate-action-highlight', className: 'symbolHighlight' } }]);
@@ -352,7 +362,7 @@ class VirtualizedViewItem extends Disposable {
         this._isHidden.set(false, undefined);
         let ref = this._templateRef.get();
         if (!ref) {
-            ref = this._objectPool.getUnusedObj(( new TemplateData(this.viewModel, this._deltaScrollVertical)));
+            ref = this._objectPool.getUnusedObj(( (new TemplateData(this.viewModel, this._deltaScrollVertical))));
             this._templateRef.set(ref, undefined);
             const selections = this.viewModel.lastTemplateData.get().selections;
             if (selections) {

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/style.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-component.multiDiffEditor{background:var(--vscode-multiDiffEditor-background);overflow-y:hidden;.active{--vscode-multiDiffEditor-border:var(--vscode-focusBorder)}.multiDiffEntry{display:flex;flex:1;flex-direction:column;overflow:hidden;.collapse-button{cursor:pointer;margin:0 5px;a{display:block}}.header{background:var(--vscode-editor-background);z-index:1000;&:not(.collapsed) .header-content{border-bottom:1px solid var(--vscode-sideBarSectionHeader-border)}.header-content{align-items:center;background:var(--vscode-multiDiffEditor-headerBackground);border-top:1px solid var(--vscode-multiDiffEditor-border);color:var(--vscode-foreground);display:flex;margin:8px 0 0;padding:4px 5px;&.shadow{box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px}.file-path{display:flex;flex:1;min-width:0;.title{font-size:14px;line-height:22px;&.original{flex:1;min-width:0;text-overflow:ellipsis}}.status{font-weight:600;line-height:22px;margin:0 10px;opacity:.75}}.actions{padding:0 8px}}}.editorParent{border-bottom:1px solid var(--vscode-multiDiffEditor-border);display:flex;flex:1;flex-direction:column;overflow:hidden}.editorContainer{flex:1}}}";
+var css = ".monaco-component.multiDiffEditor{background:var(--vscode-multiDiffEditor-background);height:100%;overflow-y:hidden;position:relative;width:100%;>div{height:100%;left:0;position:absolute;top:0;width:100%;&.placeholder{display:grid;place-content:center;place-items:center;visibility:hidden;&.visible{visibility:visible}}}.active{--vscode-multiDiffEditor-border:var(--vscode-focusBorder)}.multiDiffEntry{display:flex;flex:1;flex-direction:column;overflow:hidden;.collapse-button{cursor:pointer;margin:0 5px;a{display:block}}.header{background:var(--vscode-editor-background);z-index:1000;&:not(.collapsed) .header-content{border-bottom:1px solid var(--vscode-sideBarSectionHeader-border)}.header-content{align-items:center;background:var(--vscode-multiDiffEditor-headerBackground);border-top:1px solid var(--vscode-multiDiffEditor-border);color:var(--vscode-foreground);display:flex;margin:8px 0 0;padding:4px 5px;&.shadow{box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px}.file-path{display:flex;flex:1;min-width:0;.title{font-size:14px;line-height:22px;&.original{flex:1;min-width:0;text-overflow:ellipsis}}.status{font-weight:600;line-height:22px;margin:0 10px;opacity:.75}}.actions{padding:0 8px}}}.editorParent{border-bottom:1px solid var(--vscode-multiDiffEditor-border);display:flex;flex:1;flex-direction:column;overflow:hidden}.editorContainer{flex:1}}}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/editor/common/commands/replaceCommand.js

@@ -1,4 +1,4 @@
-import { Selection } from '../core/selection.js';
+import { Selection, SelectionDirection } from '../core/selection.js';
 class ReplaceCommand {
     constructor(range, text, insertsAutoWhitespace = false) {
         this._range = range;
@@ -25,7 +25,7 @@ class ReplaceCommandThatSelectsText {
     computeCursorState(model, helper) {
         const inverseEditOperations = helper.getInverseEditOperations();
         const srcRange = inverseEditOperations[0].range;
-        return Selection.fromRange(srcRange, 0 );
+        return Selection.fromRange(srcRange, SelectionDirection.LTR);
     }
 }
 class ReplaceCommandWithoutChangingPosition {

package/vscode/src/vs/editor/common/commands/shiftCommand.js

@@ -1,8 +1,9 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
+import { CharCode } from '../../../base/common/charCode.js';
 import { firstNonWhitespaceIndex } from '../../../base/common/strings.js';
 import { CursorColumns } from '../core/cursorColumns.js';
 import { Range } from '../core/range.js';
-import { Selection } from '../core/selection.js';
+import { Selection, SelectionDirection } from '../core/selection.js';
 import { getEnterAction } from '../languages/enterAction.js';
 import { ILanguageConfigurationService } from '../languages/languageConfigurationRegistry.js';
 var ShiftCommand_1;
@@ -109,7 +110,7 @@ let ShiftCommand = ShiftCommand_1 = class ShiftCommand {
                                 extraSpaces = previousLineExtraSpaces;
                                 if (enterAction.appendText) {
                                     for (let j = 0, lenJ = enterAction.appendText.length; j < lenJ && extraSpaces < indentSize; j++) {
-                                        if (enterAction.appendText.charCodeAt(j) === 32 ) {
+                                        if (enterAction.appendText.charCodeAt(j) === CharCode.Space) {
                                             extraSpaces++;
                                         }
                                         else {
@@ -121,7 +122,7 @@ let ShiftCommand = ShiftCommand_1 = class ShiftCommand {
                                     extraSpaces = Math.max(0, extraSpaces - enterAction.removeText);
                                 }
                                 for (let j = 0; j < extraSpaces; j++) {
-                                    if (indentationEndIndex === 0 || lineText.charCodeAt(indentationEndIndex - 1) !== 32 ) {
+                                    if (indentationEndIndex === 0 || lineText.charCodeAt(indentationEndIndex - 1) !== CharCode.Space) {
                                         break;
                                     }
                                     indentationEndIndex--;
@@ -170,7 +171,7 @@ let ShiftCommand = ShiftCommand_1 = class ShiftCommand {
                     indentationEndIndex = Math.min(indentationEndIndex, indentSize);
                     for (let i = 0; i < indentationEndIndex; i++) {
                         const chr = lineText.charCodeAt(i);
-                        if (chr === 9 ) {
+                        if (chr === CharCode.Tab) {
                             indentationEndIndex = i + 1;
                             break;
                         }
@@ -204,7 +205,7 @@ let ShiftCommand = ShiftCommand_1 = class ShiftCommand {
             if (resultStartColumn <= initialStartColumn) {
                 return result;
             }
-            if (result.getDirection() === 0 ) {
+            if (result.getDirection() === SelectionDirection.LTR) {
                 return ( new Selection(
                     result.startLineNumber,
                     initialStartColumn,

package/vscode/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.js

@@ -1,6 +1,7 @@
 import { lastNonWhitespaceIndex } from '../../../base/common/strings.js';
 import { EditOperation } from '../core/editOperation.js';
 import { Range } from '../core/range.js';
+import { StandardTokenType } from '../encodedTokenAttributes.js';
 class TrimTrailingWhitespaceCommand {
     constructor(selection, cursors, trimInRegexesAndStrings) {
         this._selection = selection;
@@ -67,7 +68,7 @@ function trimTrailingWhitespace(model, cursors, trimInRegexesAndStrings) {
             }
             const lineTokens = model.tokenization.getLineTokens(lineNumber);
             const fromColumnType = lineTokens.getStandardTokenType(lineTokens.findTokenIndexAtOffset(fromColumn));
-            if (fromColumnType === 2  || fromColumnType === 3 ) {
+            if (fromColumnType === StandardTokenType.String || fromColumnType === StandardTokenType.RegEx) {
                 continue;
             }
         }

package/vscode/src/vs/editor/common/config/editorConfigurationSchema.js

@@ -2,7 +2,7 @@ import { diffEditorDefaultOptions } from './diffEditor.js';
 import { editorOptionsRegistry } from './editorOptions.js';
 import { EDITOR_MODEL_DEFAULTS } from '../core/textModelDefaults.js';
 import { localizeWithPath } from '../../../nls.js';
-import { Extensions } from '../../../platform/configuration/common/configurationRegistry.js';
+import { ConfigurationScope, Extensions } from '../../../platform/configuration/common/configurationRegistry.js';
 import { Registry } from '../../../platform/registry/common/platform.js';
 const _moduleId = "vs/editor/common/config/editorConfigurationSchema";
 const editorConfigurationBaseNode = ( (Object.freeze({
@@ -10,7 +10,7 @@ const editorConfigurationBaseNode = ( (Object.freeze({
     order: 5,
     type: 'object',
     title: ( localizeWithPath(_moduleId, 0, "Editor")),
-    scope: 5 ,
+    scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
 })));
 const editorConfiguration = {
     ...editorConfigurationBaseNode,

package/vscode/src/vs/editor/common/config/editorOptions.d.ts

@@ -1036,6 +1036,10 @@ interface IEditorMinimapOptions {
      * Font size of section headers. Defaults to 9.
      */
     sectionHeaderFontSize?: number;
+    /**
+     * Spacing between the section header characters (in CSS px). Defaults to 1.
+     */
+    sectionHeaderLetterSpacing?: number;
 }
 /**
  * Configuration options for editor padding