@codingame/monaco-vscode-api 4.2.0 → 4.2.1

package/api.js

@@ -29,7 +29,7 @@ function createProxy(key) {
     });
 }
 const api = {
-    version: "1.88.0",
+    version: "1.88.1",
     tasks: createProxy('tasks'),
     notebooks: createProxy('notebooks'),
     scm: createProxy('scm'),

package/missing-services.js

@@ -565,8 +565,8 @@ registerSingleton(IPathService, class PathService {
 registerSingleton(IProductService, class ProductService {
     constructor() {
         this._serviceBrand = undefined;
-        this.version = "1.88.0";
-        this.commit = "5c3e652f63e798a5ac2f31ffd0d863669328dc4c";
+        this.version = "1.88.1";
+        this.commit = "e170252f762678dec6ca2cc69aba1570769a5d39";
         this.quality = 'oss';
         this.nameShort = 'Code - OSS Dev';
         this.nameLong = 'Code - OSS Dev';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -94,12 +94,12 @@
     }
   },
   "dependencies": {
-    "@codingame/monaco-vscode-extensions-service-override": "4.2.0",
-    "@codingame/monaco-vscode-files-service-override": "4.2.0",
-    "@codingame/monaco-vscode-quickaccess-service-override": "4.2.0",
-    "@codingame/monaco-vscode-environment-service-override": "4.2.0",
-    "@codingame/monaco-vscode-layout-service-override": "4.2.0",
-    "@codingame/monaco-vscode-host-service-override": "4.2.0",
-    "@codingame/monaco-vscode-base-service-override": "4.2.0"
+    "@codingame/monaco-vscode-files-service-override": "4.2.1",
+    "@codingame/monaco-vscode-quickaccess-service-override": "4.2.1",
+    "@codingame/monaco-vscode-extensions-service-override": "4.2.1",
+    "@codingame/monaco-vscode-environment-service-override": "4.2.1",
+    "@codingame/monaco-vscode-layout-service-override": "4.2.1",
+    "@codingame/monaco-vscode-host-service-override": "4.2.1",
+    "@codingame/monaco-vscode-base-service-override": "4.2.1"
   }
 }

package/services.js

@@ -153,9 +153,9 @@ async function initialize(overrides, container = document.body, configuration =
     initialize$1(container, configuration, env);
     const instantiationService = StandaloneServices.initialize({
         [( IProductService.toString())]: mixin({
-            version: "1.88.0",
+            version: "1.88.1",
             quality: 'stable',
-            commit: "5c3e652f63e798a5ac2f31ffd0d863669328dc4c",
+            commit: "e170252f762678dec6ca2cc69aba1570769a5d39",
             nameShort: 'Code - OSS',
             nameLong: 'Code - OSS',
             applicationName: 'code-oss',

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.js

@@ -50,8 +50,8 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         this._editorProgressService = _editorProgressService;
         this.elements = h('div.monaco-diff-editor.side-by-side', { style: { position: 'relative', height: '100%' } }, [
             h('div.noModificationsOverlay@overlay', { style: { position: 'absolute', height: '100%', visibility: 'hidden', } }, [$('span', {}, 'No Changes')]),
-            h('div.editor.original@original', { style: { position: 'absolute', height: '100%', zIndex: '1', } }),
-            h('div.editor.modified@modified', { style: { position: 'absolute', height: '100%', zIndex: '1', } }),
+            h('div.editor.original@original', { style: { position: 'absolute', height: '100%', } }),
+            h('div.editor.modified@modified', { style: { position: 'absolute', height: '100%', } }),
             h('div.accessibleDiffViewer@accessibleDiffViewer', { style: { position: 'absolute', height: '100%' } }),
         ]);
         this._diffModel = observableValue(this, undefined);

package/vscode/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.js

@@ -6,7 +6,7 @@ import { derived } from '../../../../../base/common/observableInternal/derived.j
 import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
 import '../../../../../base/common/cancellation.js';
-import { appendRemoveOnDispose, applyStyle } from '../utils.js';
+import { prependRemoveOnDispose, applyStyle, appendRemoveOnDispose } from '../utils.js';
 import { EditorGutter } from '../utils/editorGutter.js';
 import { ActionRunnerWithContext } from '../../multiDiffEditor/utils.js';
 import { LineRangeSet, LineRange } from '../../../../common/core/lineRange.js';
@@ -34,7 +34,7 @@ let DiffEditorGutter = class DiffEditorGutter extends Disposable {
         this._actions = observableFromEvent(this._menu.onDidChange, () => this._menu.getActions());
         this._hasActions = ( this._actions.map(a => a.length > 0));
         this.width = derived(this, reader => this._hasActions.read(reader) ? width : 0);
-        this.elements = h('div.gutter@gutter', { style: { position: 'absolute', height: '100%', width: width + 'px', zIndex: '0' } }, []);
+        this.elements = h('div.gutter@gutter', { style: { position: 'absolute', height: '100%', width: width + 'px' } }, []);
         this._currentDiff = derived(this, (reader) => {
             const model = this._diffModel.read(reader);
             if (!model) {
@@ -68,7 +68,7 @@ let DiffEditorGutter = class DiffEditorGutter extends Disposable {
             }
             return result;
         });
-        this._register(appendRemoveOnDispose(diffEditorRoot, this.elements.root));
+        this._register(prependRemoveOnDispose(diffEditorRoot, this.elements.root));
         this._register(addDisposableListener(this.elements.root, 'click', () => {
             this._editors.modified.focus();
         }));

package/vscode/src/vs/editor/browser/widget/diffEditor/utils.js

@@ -69,6 +69,12 @@ function appendRemoveOnDispose(parent, child) {
         parent.removeChild(child);
     });
 }
+function prependRemoveOnDispose(parent, child) {
+    parent.prepend(child);
+    return toDisposable(() => {
+        parent.removeChild(child);
+    });
+}
 class ObservableElementSizeObserver extends Disposable {
     get width() { return this._width; }
     get height() { return this._height; }
@@ -341,4 +347,4 @@ function filterWithPrevious(arr, filter) {
         return result;
     });
 }
-export { DisposableCancellationTokenSource, ManagedOverlayWidget, ObservableElementSizeObserver, PlaceholderViewZone, ViewZoneOverlayWidget, animatedObservable, appendRemoveOnDispose, applyObservableDecorations, applyStyle, applyViewZones, bindContextKey, filterWithPrevious, joinCombine, observeHotReloadableExports, readHotReloadableExport, translatePosition };
+export { DisposableCancellationTokenSource, ManagedOverlayWidget, ObservableElementSizeObserver, PlaceholderViewZone, ViewZoneOverlayWidget, animatedObservable, appendRemoveOnDispose, applyObservableDecorations, applyStyle, applyViewZones, bindContextKey, filterWithPrevious, joinCombine, observeHotReloadableExports, prependRemoveOnDispose, readHotReloadableExport, translatePosition };

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProvider.js

@@ -195,7 +195,13 @@ let NotebookCellOutlineProvider = class NotebookCellOutlineProvider {
                 }
             }
         }
-        if (newActive !== this._activeEntry) {
+        const showCodeCells = this._configurationService.getValue(NotebookSetting.outlineShowCodeCells);
+        const showCodeCellSymbols = this._configurationService.getValue(NotebookSetting.outlineShowCodeCellSymbols);
+        const showMarkdownHeadersOnly = this._configurationService.getValue(NotebookSetting.outlineShowMarkdownHeadersOnly);
+        if ((newActive !== this._activeEntry) && !((
+        (showMarkdownHeadersOnly && newActive?.cell.cellKind === CellKind.Markup && newActive?.level === 7) ||
+            (!showCodeCells && newActive?.cell.cellKind === CellKind.Code) || (!showCodeCellSymbols && newActive?.cell.cellKind === CellKind.Code && newActive?.level > 7))
+        )) {
             this._activeEntry = newActive;
             this._onDidChange.fire({ affectOnlyActiveElement: true });
         }