@codingame/monaco-vscode-api 1.81.8-next.2 → 1.82.0-next.0

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

@@ -27,7 +27,6 @@ import { COMMENTEDITOR_DECORATION_KEY } from './commentReply.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { IContextKeyService, RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { CommentThreadRangeDecorator } from './commentThreadRangeDecorator.js';
-import { withUndefinedAsNull, withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 const ID = 'editor.contrib.review';
 class CommentingRangeDecoration {
     get id() {
@@ -415,7 +414,7 @@ let CommentController = class CommentController {
         }
         this._editorDisposables.push(this.editor.onMouseMove(e => this.onEditorMouseMove(e)));
         this._editorDisposables.push(this.editor.onDidChangeCursorPosition(e => this.onEditorChangeCursorPosition(e.position)));
-        this._editorDisposables.push(this.editor.onDidFocusEditorWidget(() => this.onEditorChangeCursorPosition(withUndefinedAsNull(this.editor?.getPosition()))));
+        this._editorDisposables.push(this.editor.onDidFocusEditorWidget(() => this.onEditorChangeCursorPosition(this.editor?.getPosition() ?? null)));
         this._editorDisposables.push(this.editor.onDidChangeCursorSelection(e => this.onEditorChangeCursorSelection(e)));
         this._editorDisposables.push(this.editor.onDidBlurEditorWidget(() => this.onEditorChangeCursorSelection()));
     }
@@ -495,7 +494,7 @@ let CommentController = class CommentController {
             }).then(commentInfos => {
                 if (this.commentService.isCommentingEnabled) {
                     const meaningfulCommentInfos = coalesce(commentInfos);
-                    this._commentingRangeDecorator.update(this.editor, meaningfulCommentInfos, this.editor?.getPosition()?.lineNumber, withNullAsUndefined(this.editor?.getSelection()));
+                    this._commentingRangeDecorator.update(this.editor, meaningfulCommentInfos, this.editor?.getPosition()?.lineNumber, this.editor?.getSelection() ?? undefined);
                 }
             }, (err) => {
                 onUnexpectedError(err);

package/vscode/src/vs/workbench/contrib/comments/browser/media/review.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".review-widget{position:absolute;width:100%}.monaco-editor .review-widget{background-color:var(--vscode-peekViewResult-background)}.review-widget .hidden{display:none!important}.review-widget .body{overflow:hidden}.review-widget .body .review-comment{display:flex;padding:8px 16px 8px 20px}@keyframes monaco-review-widget-focus{0%{background:var(--vscode-peekViewResult-selectionBackground)}to{background:transparent}}.review-widget .body .review-comment.focus{animation:monaco-review-widget-focus 3s ease 0s}.review-widget .body .review-comment .comment-actions{margin-left:auto}.review-widget .body .review-comment .comment-actions .monaco-toolbar{height:22px}.review-widget .body .review-comment .comment-title .comment-header-info{overflow:hidden;text-overflow:ellipsis}.review-widget .body .review-comment .comment-title{display:flex;width:100%}.review-widget .body .review-comment .comment-title .action-label.codicon{line-height:18px}.review-widget .body .review-comment .comment-title .monaco-dropdown .toolbar-toggle-more{height:18px;line-height:18px;vertical-align:middle;width:16px}.review-widget .body .comment-body blockquote{border-left-style:solid;border-left-width:5px;margin:0 7px 0 5px;padding:0 16px 0 10px}.review-widget .body .review-comment .avatar-container{margin-top:4px!important}.review-widget .body .review-comment .avatar-container img.avatar{border-radius:3px;border-style:none;display:inline-block;height:28px;line-height:1;overflow:hidden;vertical-align:middle;width:28px}.review-widget .body .comment-reactions .monaco-text-button{background-color:transparent;border:1px solid grey;border-radius:3px;margin:0 7px 0 0;width:30px}.review-widget .body .review-comment .review-comment-contents{overflow:hidden;padding-left:20px;user-select:text;-webkit-user-select:text;width:100%}.review-widget .body pre{word-wrap:normal;overflow:auto;white-space:pre}.review-widget .body .review-comment .review-comment-contents .author{line-height:22px}.review-widget .body .review-comment .review-comment-contents .isPending{font-style:italic;line-height:22px;margin:0 5px;padding:0 2px}.review-widget .body .review-comment .review-comment-contents .timestamp{line-height:22px;margin:0 5px;padding:0 2px}.review-widget .body .review-comment .review-comment-contents .comment-body .comment-body-plainstring{white-space:pre-wrap}.review-widget .body .review-comment .review-comment-contents .comment-body{padding-top:4px}.review-widget .body .review-comment .review-comment-contents .comment-body-max-height{max-height:20em}.review-widget .body .review-comment .review-comment-contents .comment-reactions{margin-top:8px;min-height:25px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label{display:flex;font-size:12px;padding:1px 4px;text-align:center;white-space:pre}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label .reaction-icon{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background-position:0;background-repeat:no-repeat;background-size:14px;display:inline-block;margin-right:4px;width:14px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label .reaction-label{line-height:20px;margin-right:4px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.toolbar-toggle-pickReactions{background-position:50%;background-repeat:no-repeat;background-size:16px;border:none;display:none;font-size:16px;height:16px;margin-top:3px;width:26px}.review-widget .body .review-comment .review-comment-contents .comment-reactions:hover .action-item a.action-label.toolbar-toggle-pickReactions{background-size:16px;display:inline-block}.review-widget .body .review-comment .comment-title .action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;display:block;height:16px;line-height:16px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label{border:1px solid}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.disabled{opacity:.6}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.active:hover{background-color:var(--vscode-statusBarItem-hoverBackground)}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label:active{background-color:var(--vscode-statusBarItem-activeBackground);border:1px solid transparent}.review-widget .body .review-comment .review-comment-contents a{cursor:pointer}.review-widget .body .comment-body p,.review-widget .body .comment-body ul{margin:8px 0}.review-widget .body .comment-body p:first-child,.review-widget .body .comment-body ul:first-child{margin-top:0}.review-widget .body .comment-body p:last-child,.review-widget .body.comment-body ul:last-child{margin-bottom:0}.review-widget .body .comment-body ul{padding-left:20px}.review-widget .body .comment-body li>p{margin-bottom:0}.review-widget .body .comment-body li>ul{margin-top:0}.review-widget .body .comment-body code{border-radius:3px;padding:0 .4em}.review-widget .body .comment-body span{white-space:pre}.review-widget .body .comment-body img{max-width:100%}.review-widget .body .comment-form{margin:8px 20px}.review-widget .validation-error{word-wrap:break-word;box-sizing:border-box;display:inline-block;font-size:12px;line-height:17px;margin-left:-1px;margin-top:-1px;min-height:34px;overflow:hidden;padding:.4em;text-align:left;width:100%}.review-widget .body .comment-additional-actions{margin:10px 20px}.review-widget .body .comment-additional-actions .section-separator{border-top:1px solid var(--vscode-menu-separatorBackground);margin:10px 0 14px}.review-widget .body .comment-additional-actions .button-bar{display:flex;white-space:nowrap}.review-widget .body .comment-additional-actions .monaco-button,.review-widget .body .comment-additional-actions .monaco-button-dropdown,.review-widget .body .comment-additional-actions .monaco-text-button{display:flex;width:auto}.review-widget .body .comment-additional-actions .button-bar>.monaco-button-dropdown,.review-widget .body .comment-additional-actions .button-bar>.monaco-text-button{margin:0 10px 0 0}.review-widget .body .comment-additional-actions .button-bar .monaco-text-button{padding:4px 10px}.review-widget .body .comment-additional-actions .codicon-drop-down-button{align-items:center}.review-widget .body .monaco-editor{color:var(--vscode-editor-foreground)}.review-widget .body .comment-form.expand .review-thread-reply-button{display:none}.review-widget .body .comment-form.expand .form-actions,.review-widget .body .comment-form.expand .monaco-editor{box-sizing:content-box;display:block}.review-widget .body .comment-form .review-thread-reply-button{background-color:var(--vscode-peekViewTitle-background);border:0;border-radius:0;box-sizing:border-box;color:var(--vscode-editor-foreground);display:block;font-family:var(--monaco-monospace-font);font-size:inherit;font-weight:600;line-height:20px;outline:1px solid transparent;padding:6px 12px;resize:vertical;text-align:left;white-space:nowrap;width:100%}.review-widget .body .comment-form .review-thread-reply-button:focus{outline-style:solid;outline-width:1px}.review-widget .body .comment-form .monaco-editor,.review-widget .body .comment-form .monaco-editor .monaco-editor-background,.review-widget .body .edit-container .monaco-editor .monaco-editor-background{background-color:var(--vscode-peekViewTitle-background)}.review-widget .body .comment-form .monaco-editor,.review-widget .body .edit-container .monaco-editor{border:0;border-radius:3px;box-sizing:content-box;max-height:500px;min-height:90px;padding:6px 0 6px 12px;width:100%}.review-widget .body .comment-form .form-actions,.review-widget .body .comment-form .monaco-editor{display:none}.review-widget .body .comment-form .form-actions,.review-widget .body .edit-container .form-actions{margin:10px 0;overflow:auto}.review-widget .body .edit-container .form-actions{padding-top:10px}.review-widget .body .edit-textarea{height:90px;margin:5px 12px 10px 0}.review-widget .body .comment-form .monaco-text-button,.review-widget .body .edit-container .monaco-text-button{margin-left:5px;padding:4px 10px;width:auto}.review-widget .body .form-actions .monaco-text-button{float:right}.review-widget .head{box-sizing:border-box;display:flex;height:100%}.review-widget .head .review-title{cursor:default;display:inline-block;font-size:13px;margin-left:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.review-widget .head .review-title .dirname:not(:empty){font-size:.9em;margin-left:.5em}.review-widget .head .review-actions{flex:1;padding-right:2px;text-align:right}.review-widget .head .review-actions>.monaco-action-bar{display:inline-block}.review-widget .head .review-actions>.monaco-action-bar,.review-widget .head .review-actions>.monaco-action-bar>.actions-container{height:100%}.review-widget .action-item{margin-left:4px;min-height:20px;min-width:18px}.review-widget .head .review-actions>.monaco-action-bar .action-label{background-position:50%;background-repeat:no-repeat;line-height:inherit;margin:0}.review-widget .head .review-actions>.monaco-action-bar .action-label.codicon{margin:0}.review-widget>.body{border-top:1px solid;position:relative}.monaco-editor .comment-range-glyph{cursor:pointer;margin-left:10px;width:4px!important;z-index:10}div.preview.inline .monaco-editor .comment-range-glyph{display:none!important}.monaco-editor .comment-diff-added{border-left-style:solid;border-left-width:3px}.monaco-editor .comment-diff-added,.monaco-editor .comment-range-glyph.multiline-add{border-left-color:var(--vscode-editorGutter-commentRangeForeground)}.monaco-editor .comment-diff-added:before,.monaco-editor .comment-range-glyph.line-hover:before,.monaco-editor .comment-thread-unresolved:before,.monaco-editor .comment-thread:before{background:var(--vscode-editorGutter-commentRangeForeground)}.monaco-editor .comment-thread-range,.monaco-editor .comment-thread-range-current{border-style:solid;border-width:1px;box-sizing:border-box}.monaco-editor .comment-thread-range{background-color:var(--vscode-editorCommentsWidget-rangeBackground);border-color:var(--vscode-editorCommentsWidget-rangeBorder)}.monaco-editor .comment-thread-range-current{background-color:var(--vscode-editorCommentsWidget-rangeActiveBackground);border-color:var(--vscode-editorCommentsWidget-rangeActiveBorder)}.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread,.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread-unresolved,.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover{margin-left:13px}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before,.monaco-editor .comment-range-glyph.comment-thread:before,.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover:before,.monaco-editor .margin-view-overlays>div:hover>.comment-range-glyph.comment-diff-added:before{align-items:center;color:var(--vscode-editorGutter-commentGlyphForeground);display:flex;flex-direction:row;height:100%;justify-content:center;left:-6px;position:absolute;text-align:center;width:9px;z-index:10}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before{color:var(--vscode-editorGutter-commentUnresolvedGlyphForeground)}.monaco-editor .margin-view-overlays .comment-range-glyph.multiline-add{border-left-style:dotted;border-left-width:3px;height:16px;margin-top:2px}.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover:before,.monaco-editor .margin-view-overlays>div:hover>.comment-range-glyph.comment-diff-added:before{border-radius:3px;content:\"\\ea60\";font-family:codicon;margin-left:-5px;padding-left:1px;width:18px!important}.monaco-editor .comment-range-glyph.comment-thread,.monaco-editor .comment-range-glyph.comment-thread-unresolved{z-index:20}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before,.monaco-editor .comment-range-glyph.comment-thread:before{border-radius:3px;font-family:codicon;font-size:13px;line-height:100%;margin-left:-5px;padding-left:1px;padding-top:1px;width:18px!important;z-index:20}.monaco-editor .comment-range-glyph.comment-thread:before{content:\"\\ea6b\"}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before{content:\"\\ec0a\"}.monaco-editor.inline-comment .margin-view-overlays .codicon-folding-collapsed,.monaco-editor.inline-comment .margin-view-overlays .codicon-folding-expanded{margin-left:11px}.monaco-editor.inline-comment .margin-view-overlays .dirty-diff-glyph{margin-left:25px}";
+var css = ".review-widget{position:absolute;width:100%}.monaco-editor .review-widget{background-color:var(--vscode-peekViewResult-background)}.review-widget .hidden{display:none!important}.review-widget .body{overflow:hidden}.review-widget .body .review-comment{display:flex;padding:8px 16px 8px 20px}@keyframes monaco-review-widget-focus{0%{background:var(--vscode-peekViewResult-selectionBackground)}to{background:transparent}}.review-widget .body .review-comment.focus{animation:monaco-review-widget-focus 3s ease 0s}.review-widget .body .review-comment .comment-actions{margin-left:auto}.review-widget .body .review-comment .comment-actions .monaco-toolbar{height:22px}.review-widget .body .review-comment .comment-title .comment-header-info{overflow:hidden;text-overflow:ellipsis}.review-widget .body .review-comment .comment-title{display:flex;width:100%}.review-widget .body .review-comment .comment-title .action-label.codicon{line-height:18px}.review-widget .body .review-comment .comment-title .monaco-dropdown .toolbar-toggle-more{height:18px;line-height:18px;vertical-align:middle;width:16px}.review-widget .body .comment-body blockquote{border-left-style:solid;border-left-width:5px;margin:0 7px 0 5px;padding:0 16px 0 10px}.review-widget .body .review-comment .avatar-container{margin-top:4px!important}.review-widget .body .review-comment .avatar-container img.avatar{border-radius:3px;border-style:none;display:inline-block;height:28px;line-height:1;overflow:hidden;vertical-align:middle;width:28px}.review-widget .body .comment-reactions .monaco-text-button{background-color:transparent;border:1px solid grey;border-radius:3px;margin:0 7px 0 0;width:30px}.review-widget .body .review-comment .review-comment-contents{overflow:hidden;padding-left:20px;user-select:text;-webkit-user-select:text;width:100%}.review-widget .body pre{word-wrap:normal;overflow:auto;white-space:pre}.review-widget .body .review-comment .review-comment-contents .author{line-height:22px}.review-widget .body .review-comment .review-comment-contents .isPending{font-style:italic;line-height:22px;margin:0 5px;padding:0 2px}.review-widget .body .review-comment .review-comment-contents .timestamp{line-height:22px;margin:0 5px;padding:0 2px}.review-widget .body .review-comment .review-comment-contents .comment-body .comment-body-plainstring{white-space:pre-wrap}.review-widget .body .review-comment .review-comment-contents .comment-body{padding-top:4px}.review-widget .body .review-comment .review-comment-contents .comment-body-max-height{max-height:20em}.review-widget .body .review-comment .review-comment-contents .comment-reactions{margin-top:8px;min-height:25px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label{display:flex;font-size:12px;padding:1px 4px;text-align:center;white-space:pre}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label .reaction-icon{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background-position:0;background-repeat:no-repeat;background-size:14px;display:inline-block;margin-right:4px;width:14px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label .reaction-label{line-height:20px;margin-right:4px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.toolbar-toggle-pickReactions{background-position:50%;background-repeat:no-repeat;background-size:16px;border:none;display:none;font-size:16px;height:16px;margin-top:3px;width:26px}.review-widget .body .review-comment .review-comment-contents .comment-reactions:hover .action-item a.action-label.toolbar-toggle-pickReactions{background-size:16px;display:inline-block}.review-widget .body .review-comment .comment-title .action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;display:block;height:16px;line-height:16px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label{border:1px solid}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.disabled{opacity:.6}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.active:hover{background-color:var(--vscode-statusBarItem-hoverBackground)}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label:active{background-color:var(--vscode-statusBarItem-activeBackground);border:1px solid transparent}.review-widget .body .review-comment .review-comment-contents a{cursor:pointer}.review-widget .body .comment-body p,.review-widget .body .comment-body ul{margin:8px 0}.review-widget .body .comment-body p:first-child,.review-widget .body .comment-body ul:first-child{margin-top:0}.review-widget .body .comment-body p:last-child,.review-widget .body.comment-body ul:last-child{margin-bottom:0}.review-widget .body .comment-body ul{padding-left:20px}.review-widget .body .comment-body li>p{margin-bottom:0}.review-widget .body .comment-body li>ul{margin-top:0}.review-widget .body .comment-body code{border-radius:3px;padding:0 .4em}.review-widget .body .comment-body span{white-space:pre}.review-widget .body .comment-body img{max-width:100%}.review-widget .body .comment-form{margin:8px 20px}.review-widget .validation-error{word-wrap:break-word;box-sizing:border-box;display:inline-block;font-size:12px;line-height:17px;margin-left:-1px;margin-top:-1px;min-height:34px;overflow:hidden;padding:.4em;text-align:left;width:100%}.review-widget .body .comment-additional-actions{margin:10px 20px}.review-widget .body .comment-additional-actions .section-separator{border-top:1px solid var(--vscode-menu-separatorBackground);margin:10px 0 14px}.review-widget .body .comment-additional-actions .button-bar{display:flex;white-space:nowrap}.review-widget .body .comment-additional-actions .monaco-button,.review-widget .body .comment-additional-actions .monaco-button-dropdown,.review-widget .body .comment-additional-actions .monaco-text-button{display:flex;width:auto}.review-widget .body .comment-additional-actions .button-bar>.monaco-button-dropdown,.review-widget .body .comment-additional-actions .button-bar>.monaco-text-button{margin:0 10px 0 0}.review-widget .body .comment-additional-actions .button-bar .monaco-text-button{padding:4px 10px}.review-widget .body .comment-additional-actions .codicon-drop-down-button{align-items:center}.review-widget .body .monaco-editor{color:var(--vscode-editor-foreground)}.review-widget .body .comment-form.expand .review-thread-reply-button{display:none}.review-widget .body .comment-form.expand .form-actions,.review-widget .body .comment-form.expand .monaco-editor{box-sizing:content-box;display:block}.review-widget .body .comment-form .review-thread-reply-button{background-color:var(--vscode-peekViewTitle-background);border:0;border-radius:0;box-sizing:border-box;color:var(--vscode-editor-foreground);display:block;font-family:var(--monaco-monospace-font);font-size:inherit;font-weight:600;line-height:20px;outline:1px solid transparent;padding:6px 12px;resize:vertical;text-align:left;white-space:nowrap;width:100%}.review-widget .body .comment-form .review-thread-reply-button:focus{outline-style:solid;outline-width:1px}.review-widget .body .comment-form .monaco-editor,.review-widget .body .comment-form .monaco-editor .monaco-editor-background,.review-widget .body .edit-container .monaco-editor .monaco-editor-background{background-color:var(--vscode-peekViewTitle-background)}.review-widget .body .comment-form .monaco-editor,.review-widget .body .edit-container .monaco-editor{border:0;border-radius:3px;box-sizing:content-box;max-height:500px;min-height:90px;padding:6px 0 6px 12px;width:100%}.review-widget .body .comment-form .form-actions,.review-widget .body .comment-form .monaco-editor{display:none}.review-widget .body .comment-form .form-actions,.review-widget .body .edit-container .form-actions{margin:10px 0;overflow:auto}.review-widget .body .edit-container .form-actions{padding-top:10px}.review-widget .body .edit-textarea{height:90px;margin:5px 12px 10px 0}.review-widget .body .comment-form .monaco-text-button,.review-widget .body .edit-container .monaco-text-button{margin-left:5px;padding:4px 10px;width:auto}.review-widget .body .form-actions .monaco-text-button{float:right}.review-widget .head{box-sizing:border-box;display:flex;height:100%}.review-widget .head .review-title{cursor:default;display:inline-block;font-size:13px;margin-left:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.review-widget .head .review-title .dirname:not(:empty){font-size:.9em;margin-left:.5em}.review-widget .head .review-actions{flex:1;padding-right:2px;text-align:right}.review-widget .head .review-actions>.monaco-action-bar{display:inline-block}.review-widget .head .review-actions>.monaco-action-bar,.review-widget .head .review-actions>.monaco-action-bar>.actions-container{height:100%}.review-widget .action-item{margin-left:4px;min-height:20px;min-width:18px}.review-widget .head .review-actions>.monaco-action-bar .action-label{background-position:50%;background-repeat:no-repeat;line-height:inherit;margin:0}.review-widget .head .review-actions>.monaco-action-bar .action-label.codicon{margin:0}.review-widget>.body{border-top:1px solid;position:relative}.monaco-editor .comment-range-glyph{cursor:pointer;margin-left:10px;width:4px!important;z-index:10}div.preview.inline .monaco-editor .comment-range-glyph{display:none!important}.monaco-editor .comment-diff-added{border-left-style:solid;border-left-width:3px}.monaco-editor .comment-diff-added,.monaco-editor .comment-range-glyph.multiline-add{border-left-color:var(--vscode-editorGutter-commentRangeForeground)}.monaco-editor .comment-diff-added:before,.monaco-editor .comment-range-glyph.line-hover:before,.monaco-editor .comment-thread-unresolved:before,.monaco-editor .comment-thread:before{background:var(--vscode-editorGutter-commentRangeForeground)}.monaco-editor .comment-thread-range{background-color:var(--vscode-editorCommentsWidget-rangeBackground)}.monaco-editor .comment-thread-range-current{background-color:var(--vscode-editorCommentsWidget-rangeActiveBackground)}.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread,.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread-unresolved,.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover{margin-left:13px}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before,.monaco-editor .comment-range-glyph.comment-thread:before,.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover:before,.monaco-editor .margin-view-overlays>div:hover>.comment-range-glyph.comment-diff-added:before{align-items:center;color:var(--vscode-editorGutter-commentGlyphForeground);display:flex;flex-direction:row;height:100%;justify-content:center;left:-6px;position:absolute;text-align:center;width:9px;z-index:10}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before{color:var(--vscode-editorGutter-commentUnresolvedGlyphForeground)}.monaco-editor .margin-view-overlays .comment-range-glyph.multiline-add{border-left-style:dotted;border-left-width:3px;height:16px;margin-top:2px}.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover:before,.monaco-editor .margin-view-overlays>div:hover>.comment-range-glyph.comment-diff-added:before{border-radius:3px;content:\"\\ea60\";font-family:codicon;margin-left:-5px;padding-left:1px;width:18px!important}.monaco-editor .comment-range-glyph.comment-thread,.monaco-editor .comment-range-glyph.comment-thread-unresolved{z-index:20}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before,.monaco-editor .comment-range-glyph.comment-thread:before{border-radius:3px;font-family:codicon;font-size:13px;line-height:100%;margin-left:-5px;padding-left:1px;padding-top:1px;width:18px!important;z-index:20}.monaco-editor .comment-range-glyph.comment-thread:before{content:\"\\ea6b\"}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before{content:\"\\ec0a\"}.monaco-editor.inline-comment .margin-view-overlays .codicon-folding-collapsed,.monaco-editor.inline-comment .margin-view-overlays .codicon-folding-expanded{margin-left:11px}.monaco-editor.inline-comment .margin-view-overlays .dirty-diff-glyph{margin-left:25px}";
 n(css,{});
 export { css, css as default };

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

@@ -68,7 +68,8 @@ let SimpleCommentEditor = class SimpleCommentEditor extends CodeEditorWidget {
                 enabled: false
             },
             autoClosingBrackets: configurationService.getValue('editor.autoClosingBrackets'),
-            quickSuggestions: false
+            quickSuggestions: false,
+            accessibilitySupport: configurationService.getValue('editor.accessibilitySupport'),
         };
     }
 };

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInput.js

@@ -15,7 +15,9 @@ import { LazilyResolvedWebviewEditorInput, IWebviewWorkbenchService } from '../.
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { IUntitledTextEditorService } from '../../../services/untitled/common/untitledTextEditorService.js';
 import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+var CustomEditorInput_1;
 let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
+    static { CustomEditorInput_1 = this; }
     static create(instantiationService, resource, viewType, group, options) {
         return instantiationService.invokeFunction(accessor => {
             const untitledString = accessor.get(IUntitledTextEditorService).getValue(resource);
@@ -27,7 +29,7 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
                 contentOptions: {},
                 extension: undefined,
             });
-            const input = instantiationService.createInstance(CustomEditorInput, { resource, viewType }, webview, { untitledDocumentData: untitledDocumentData, oldResource: options?.oldResource });
+            const input = instantiationService.createInstance(CustomEditorInput_1, { resource, viewType }, webview, { untitledDocumentData: untitledDocumentData, oldResource: options?.oldResource });
             if (typeof group !== 'undefined') {
                 input.updateGroup(group);
             }
@@ -78,7 +80,7 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
         this._onDidChangeLabel.fire();
     }
     get typeId() {
-        return CustomEditorInput.typeId;
+        return CustomEditorInput_1.typeId;
     }
     get editorId() {
         return this.viewType;
@@ -169,12 +171,12 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
         if (super.matches(other)) {
             return true;
         }
-        return this === other || (other instanceof CustomEditorInput
+        return this === other || (other instanceof CustomEditorInput_1
             && this.viewType === other.viewType
             && isEqual(this.resource, other.resource));
     }
     copy() {
-        return CustomEditorInput.create(this.instantiationService, this.resource, this.viewType, this.group, this.webview.options);
+        return CustomEditorInput_1.create(this.instantiationService, this.resource, this.viewType, this.group, this.webview.options);
     }
     isReadonly() {
         if (!this._modelRef) {
@@ -284,7 +286,7 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
         };
     }
 };
-CustomEditorInput = ( __decorate([
+CustomEditorInput = CustomEditorInput_1 = ( __decorate([
     ( __param(3, IWebviewWorkbenchService)),
     ( __param(4, IInstantiationService)),
     ( __param(5, ILabelService)),

package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js

@@ -4,12 +4,13 @@ import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
-let CustomTextEditorModel = class CustomTextEditorModel extends Disposable {
+var CustomTextEditorModel_1;
+let CustomTextEditorModel = CustomTextEditorModel_1 = class CustomTextEditorModel extends Disposable {
     static async create(instantiationService, viewType, resource) {
         return instantiationService.invokeFunction(async (accessor) => {
             const textModelResolverService = accessor.get(ITextModelService);
             const model = await textModelResolverService.createModelReference(resource);
-            return instantiationService.createInstance(CustomTextEditorModel, viewType, resource, model);
+            return instantiationService.createInstance(CustomTextEditorModel_1, viewType, resource, model);
         });
     }
     constructor(viewType, _resource, _model, textFileService) {
@@ -64,7 +65,7 @@ let CustomTextEditorModel = class CustomTextEditorModel extends Disposable {
         return !!(await this.textFileService.saveAs(resource, targetResource, options));
     }
 };
-CustomTextEditorModel = ( __decorate([
+CustomTextEditorModel = CustomTextEditorModel_1 = ( __decorate([
     ( __param(3, ITextFileService))
 ], CustomTextEditorModel));
 export { CustomTextEditorModel };

package/vscode/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.js

@@ -14,7 +14,6 @@ import * as platform from 'monaco-editor/esm/vs/base/common/platform.js';
 import Severity from 'monaco-editor/esm/vs/base/common/severity.js';
 import { noBreakWhitespace } from 'monaco-editor/esm/vs/base/common/strings.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
 import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
@@ -77,7 +76,7 @@ function getBreakpointDecorationOptions(accessor, model, breakpoint, state, brea
             const message = dbg?.strings?.[DebuggerString.UnverifiedBreakpoints];
             if (message) {
                 if (!langId) {
-                    langId = withNullAsUndefined(languageService.guessLanguageIdByFilepathOrFirstLine(breakpoint.uri));
+                    langId = languageService.guessLanguageIdByFilepathOrFirstLine(breakpoint.uri) ?? undefined;
                 }
                 return langId && dbg.interestedInLanguage(langId) ? message : undefined;
             }

package/vscode/src/vs/workbench/contrib/debug/browser/breakpointsView.js

@@ -36,6 +36,7 @@ import { DataBreakpoint, FunctionBreakpoint, InstructionBreakpoint, Breakpoint,
 import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IHoverService } from '../../../services/hover/browser/hover.js';
+var BreakpointsRenderer_1, FunctionBreakpointsRenderer_1, DataBreakpointsRenderer_1, InstructionBreakpointsRenderer_1;
 const $ = dom.$;
 function createCheckbox(disposables) {
     const checkbox = $('input');
@@ -350,6 +351,7 @@ class BreakpointsDelegate {
 }
 const breakpointIdToActionBarDomeNode = ( new Map());
 let BreakpointsRenderer = class BreakpointsRenderer {
+    static { BreakpointsRenderer_1 = this; }
     constructor(menu, breakpointSupportsCondition, breakpointItemType, debugService, labelService) {
         this.menu = menu;
         this.breakpointSupportsCondition = breakpointSupportsCondition;
@@ -359,7 +361,7 @@ let BreakpointsRenderer = class BreakpointsRenderer {
     }
     static { this.ID = 'breakpoints'; }
     get templateId() {
-        return BreakpointsRenderer.ID;
+        return BreakpointsRenderer_1.ID;
     }
     renderTemplate(container) {
         const data = Object.create(null);
@@ -410,7 +412,7 @@ let BreakpointsRenderer = class BreakpointsRenderer {
         dispose(templateData.toDispose);
     }
 };
-BreakpointsRenderer = ( __decorate([
+BreakpointsRenderer = BreakpointsRenderer_1 = ( __decorate([
     ( __param(3, IDebugService)),
     ( __param(4, ILabelService))
 ], BreakpointsRenderer));
@@ -466,6 +468,7 @@ class ExceptionBreakpointsRenderer {
     }
 }
 let FunctionBreakpointsRenderer = class FunctionBreakpointsRenderer {
+    static { FunctionBreakpointsRenderer_1 = this; }
     constructor(menu, breakpointSupportsCondition, breakpointItemType, debugService, labelService) {
         this.menu = menu;
         this.breakpointSupportsCondition = breakpointSupportsCondition;
@@ -475,7 +478,7 @@ let FunctionBreakpointsRenderer = class FunctionBreakpointsRenderer {
     }
     static { this.ID = 'functionbreakpoints'; }
     get templateId() {
-        return FunctionBreakpointsRenderer.ID;
+        return FunctionBreakpointsRenderer_1.ID;
     }
     renderTemplate(container) {
         const data = Object.create(null);
@@ -533,18 +536,19 @@ let FunctionBreakpointsRenderer = class FunctionBreakpointsRenderer {
         dispose(templateData.toDispose);
     }
 };
-FunctionBreakpointsRenderer = ( __decorate([
+FunctionBreakpointsRenderer = FunctionBreakpointsRenderer_1 = ( __decorate([
     ( __param(3, IDebugService)),
     ( __param(4, ILabelService))
 ], FunctionBreakpointsRenderer));
 let DataBreakpointsRenderer = class DataBreakpointsRenderer {
+    static { DataBreakpointsRenderer_1 = this; }
     constructor(debugService, labelService) {
         this.debugService = debugService;
         this.labelService = labelService;
     }
     static { this.ID = 'databreakpoints'; }
     get templateId() {
-        return DataBreakpointsRenderer.ID;
+        return DataBreakpointsRenderer_1.ID;
     }
     renderTemplate(container) {
         const data = Object.create(null);
@@ -589,18 +593,19 @@ let DataBreakpointsRenderer = class DataBreakpointsRenderer {
         dispose(templateData.toDispose);
     }
 };
-DataBreakpointsRenderer = ( __decorate([
+DataBreakpointsRenderer = DataBreakpointsRenderer_1 = ( __decorate([
     ( __param(0, IDebugService)),
     ( __param(1, ILabelService))
 ], DataBreakpointsRenderer));
 let InstructionBreakpointsRenderer = class InstructionBreakpointsRenderer {
+    static { InstructionBreakpointsRenderer_1 = this; }
     constructor(debugService, labelService) {
         this.debugService = debugService;
         this.labelService = labelService;
     }
     static { this.ID = 'instructionBreakpoints'; }
     get templateId() {
-        return InstructionBreakpointsRenderer.ID;
+        return InstructionBreakpointsRenderer_1.ID;
     }
     renderTemplate(container) {
         const data = Object.create(null);
@@ -636,7 +641,7 @@ let InstructionBreakpointsRenderer = class InstructionBreakpointsRenderer {
         dispose(templateData.toDispose);
     }
 };
-InstructionBreakpointsRenderer = ( __decorate([
+InstructionBreakpointsRenderer = InstructionBreakpointsRenderer_1 = ( __decorate([
     ( __param(0, IDebugService)),
     ( __param(1, ILabelService))
 ], InstructionBreakpointsRenderer));

package/vscode/src/vs/workbench/contrib/debug/browser/callStackView.js

@@ -35,6 +35,7 @@ import { createDisconnectMenuItemAction } from './debugToolBar.js';
 import { CALLSTACK_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_CALLSTACK_ITEM_STOPPED, CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD, IDebugService, CONTEXT_STACK_FRAME_SUPPORTS_RESTART } from '../common/debug.js';
 import { Thread, StackFrame, ThreadAndSessionIds } from '../common/debugModel.js';
 import { isSessionAttach } from '../common/debugUtils.js';
+var SessionsRenderer_1, ThreadsRenderer_1, StackFramesRenderer_1;
 const $ = dom.$;
 function assignSessionContext(element, context) {
     context.sessionId = element.getId();
@@ -416,6 +417,7 @@ function getSessionContextOverlay(session) {
     ];
 }
 let SessionsRenderer = class SessionsRenderer {
+    static { SessionsRenderer_1 = this; }
     static { this.ID = 'session'; }
     constructor(instantiationService, contextKeyService, menuService) {
         this.instantiationService = instantiationService;
@@ -423,7 +425,7 @@ let SessionsRenderer = class SessionsRenderer {
         this.menuService = menuService;
     }
     get templateId() {
-        return SessionsRenderer.ID;
+        return SessionsRenderer_1.ID;
     }
     renderTemplate(container) {
         const session = dom.append(container, $('.session'));
@@ -506,7 +508,7 @@ let SessionsRenderer = class SessionsRenderer {
         templateData.elementDisposable.clear();
     }
 };
-SessionsRenderer = ( __decorate([
+SessionsRenderer = SessionsRenderer_1 = ( __decorate([
     ( __param(0, IInstantiationService)),
     ( __param(1, IContextKeyService)),
     ( __param(2, IMenuService))
@@ -518,13 +520,14 @@ function getThreadContextOverlay(thread) {
     ];
 }
 let ThreadsRenderer = class ThreadsRenderer {
+    static { ThreadsRenderer_1 = this; }
     static { this.ID = 'thread'; }
     constructor(contextKeyService, menuService) {
         this.contextKeyService = contextKeyService;
         this.menuService = menuService;
     }
     get templateId() {
-        return ThreadsRenderer.ID;
+        return ThreadsRenderer_1.ID;
     }
     renderTemplate(container) {
         const thread = dom.append(container, $('.thread'));
@@ -566,7 +569,7 @@ let ThreadsRenderer = class ThreadsRenderer {
         templateData.templateDisposable.dispose();
     }
 };
-ThreadsRenderer = ( __decorate([
+ThreadsRenderer = ThreadsRenderer_1 = ( __decorate([
     ( __param(0, IContextKeyService)),
     ( __param(1, IMenuService))
 ], ThreadsRenderer));
@@ -577,13 +580,14 @@ function getStackFrameContextOverlay(stackFrame) {
     ];
 }
 let StackFramesRenderer = class StackFramesRenderer {
+    static { StackFramesRenderer_1 = this; }
     static { this.ID = 'stackFrame'; }
     constructor(labelService, notificationService) {
         this.labelService = labelService;
         this.notificationService = notificationService;
     }
     get templateId() {
-        return StackFramesRenderer.ID;
+        return StackFramesRenderer_1.ID;
     }
     renderTemplate(container) {
         const stackFrame = dom.append(container, $('.stack-frame'));
@@ -640,7 +644,7 @@ let StackFramesRenderer = class StackFramesRenderer {
         templateData.actionBar.dispose();
     }
 };
-StackFramesRenderer = ( __decorate([
+StackFramesRenderer = StackFramesRenderer_1 = ( __decorate([
     ( __param(0, ILabelService)),
     ( __param(1, INotificationService))
 ], StackFramesRenderer));

package/vscode/src/vs/workbench/contrib/debug/browser/debug.contribution.js

@@ -54,7 +54,11 @@ registerColors();
     prefix: DEBUG_QUICK_ACCESS_PREFIX,
     contextKey: 'inLaunchConfigurationsPicker',
     placeholder: ( nls.localize('startDebugPlaceholder', "Type the name of a launch configuration to run.")),
-    helpEntries: [{ description: ( nls.localize('startDebuggingHelp', "Start Debugging")), commandId: SELECT_AND_START_ID }]
+    helpEntries: [{
+            description: ( nls.localize('startDebuggingHelp', "Start Debugging")),
+            commandId: SELECT_AND_START_ID,
+            commandCenterOrder: 50
+        }]
 });
 ( Registry.as(Extensions$1.Quickaccess)).registerQuickAccessProvider({
     ctor: DebugConsoleQuickAccess,

package/vscode/src/vs/workbench/contrib/debug/browser/debugActionViewItems.js

@@ -16,8 +16,10 @@ import { BaseActionViewItem, SelectActionViewItem } from 'monaco-editor/esm/vs/b
 import { debugStart } from './debugIcons.js';
 import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
 import { defaultSelectBoxStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
+var StartDebugActionViewItem_1;
 const $ = dom.$;
 let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseActionViewItem {
+    static { StartDebugActionViewItem_1 = this; }
     static { this.SEPARATOR = '\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500'; }
     constructor(context, action, debugService, configurationService, commandService, contextService, contextViewService, keybindingService) {
         super(context, action);
@@ -161,7 +163,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
             if (lastGroup !== presentation?.group) {
                 lastGroup = presentation?.group;
                 if (this.debugOptions.length) {
-                    this.debugOptions.push({ label: StartDebugActionViewItem.SEPARATOR, handler: () => Promise.resolve(false) });
+                    this.debugOptions.push({ label: StartDebugActionViewItem_1.SEPARATOR, handler: () => Promise.resolve(false) });
                     disabledIdxs.push(this.debugOptions.length - 1);
                 }
             }
@@ -191,7 +193,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
         if (this.debugOptions.length === 0) {
             this.debugOptions.push({ label: ( nls.localize('noConfigurations', "No Configurations")), handler: async () => false });
         }
-        this.debugOptions.push({ label: StartDebugActionViewItem.SEPARATOR, handler: () => Promise.resolve(false) });
+        this.debugOptions.push({ label: StartDebugActionViewItem_1.SEPARATOR, handler: () => Promise.resolve(false) });
         disabledIdxs.push(this.debugOptions.length - 1);
         this.providers.forEach(p => {
             this.debugOptions.push({
@@ -220,7 +222,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
         )), this.selected);
     }
 };
-StartDebugActionViewItem = ( __decorate([
+StartDebugActionViewItem = StartDebugActionViewItem_1 = ( __decorate([
     ( __param(2, IDebugService)),
     ( __param(3, IConfigurationService)),
     ( __param(4, ICommandService)),

package/vscode/src/vs/workbench/contrib/debug/browser/debugCommands.js

@@ -407,7 +407,6 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: STEP_OVER_ID,
     weight: 200 ,
     primary: 68 ,
-    secondary: isWeb ? [((512  | 68) )] : undefined,
     when: ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')),
     handler: async (accessor, _, context) => {
         const contextKeyService = accessor.get(IContextKeyService);

package/vscode/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.js

@@ -7,7 +7,6 @@ import * as json from 'monaco-editor/esm/vs/base/common/json.js';
 import { dispose, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import * as objects from 'monaco-editor/esm/vs/base/common/objects.js';
 import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
-import { withUndefinedAsNull } from 'monaco-editor/esm/vs/base/common/types.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import * as nls from 'monaco-editor/esm/vs/nls.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
@@ -520,7 +519,7 @@ let Launch = class Launch extends AbstractLaunch {
             },
         }, ACTIVE_GROUP);
         return ({
-            editor: withUndefinedAsNull(editor),
+            editor: editor ?? null,
             created
         });
     }
@@ -574,7 +573,7 @@ let WorkspaceLaunch = class WorkspaceLaunch extends AbstractLaunch {
             options: { preserveFocus }
         }, ACTIVE_GROUP);
         return ({
-            editor: withUndefinedAsNull(editor),
+            editor: editor ?? null,
             created: false
         });
     }
@@ -608,7 +607,7 @@ let UserLaunch = class UserLaunch extends AbstractLaunch {
     async openConfigFile({ preserveFocus, type, useInitialContent }) {
         const editor = await this.preferencesService.openUserSettings({ jsonEditor: true, preserveFocus, revealSetting: { key: 'launch' } });
         return ({
-            editor: withUndefinedAsNull(editor),
+            editor: editor ?? null,
             created: false
         });
     }

package/vscode/src/vs/workbench/contrib/debug/browser/debugHover.js

@@ -20,6 +20,7 @@ import { VariablesRenderer } from './variablesView.js';
 import { IDebugService } from '../common/debug.js';
 import { Variable, Expression } from '../common/debugModel.js';
 import { getEvaluatableExpressionAtPosition } from '../common/debugUtils.js';
+var DebugHoverWidget_1;
 const $ = dom.$;
 async function doFindExpression(container, namesToFind) {
     if (!container) {
@@ -44,6 +45,7 @@ async function findExpressionInStackFrame(stackFrame, namesToFind) {
     return expressions.length > 0 && expressions.every(e => e.value === expressions[0].value) ? expressions[0] : undefined;
 }
 let DebugHoverWidget = class DebugHoverWidget {
+    static { DebugHoverWidget_1 = this; }
     static { this.ID = 'debug.hoverWidget'; }
     constructor(editor, debugService, instantiationService) {
         this.editor = editor;
@@ -133,7 +135,7 @@ let DebugHoverWidget = class DebugHoverWidget {
         return !!this.showCancellationSource;
     }
     getId() {
-        return DebugHoverWidget.ID;
+        return DebugHoverWidget_1.ID;
     }
     getDomNode() {
         return this.domNode;
@@ -169,7 +171,7 @@ let DebugHoverWidget = class DebugHoverWidget {
         }
         this.highlightDecorations.set([{
                 range: result.range,
-                options: DebugHoverWidget._HOVER_HIGHLIGHT_DECORATION_OPTIONS
+                options: DebugHoverWidget_1._HOVER_HIGHLIGHT_DECORATION_OPTIONS
             }]);
         return this.doShow(result.range.getStartPosition(), expression, focus);
     }
@@ -267,7 +269,7 @@ let DebugHoverWidget = class DebugHoverWidget {
         this.toDispose = lifecycle.dispose(this.toDispose);
     }
 };
-DebugHoverWidget = ( __decorate([
+DebugHoverWidget = DebugHoverWidget_1 = ( __decorate([
     ( __param(1, IDebugService)),
     ( __param(2, IInstantiationService))
 ], DebugHoverWidget));

package/vscode/src/vs/workbench/contrib/debug/browser/debugQuickAccess.js

@@ -6,7 +6,6 @@ import { IDebugService } from '../common/debug.js';
 import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
 import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { matchesFuzzy } from 'monaco-editor/esm/vs/base/common/filters.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { DEBUG_QUICK_ACCESS_PREFIX, ADD_CONFIGURATION_ID } from './debugCommands.js';
 import { debugConfigure, debugRemoveConfig } from './debugIcons.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
@@ -126,7 +125,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
             picks.push({
                 label,
                 description: this.contextService.getWorkbenchState() === 3  ? launch.name : '',
-                highlights: { label: withNullAsUndefined(matchesFuzzy(filter, label, true)) },
+                highlights: { label: matchesFuzzy(filter, label, true) ?? undefined },
                 accept: () => this.commandService.executeCommand(ADD_CONFIGURATION_ID, ( launch.uri.toString()))
             });
         }

package/vscode/src/vs/workbench/contrib/debug/browser/debugService.js

@@ -83,7 +83,7 @@ let DebugService = class DebugService {
         this.disposables.add(this.adapterManager);
         this.configurationManager = this.instantiationService.createInstance(ConfigurationManager, this.adapterManager);
         this.disposables.add(this.configurationManager);
-        this.debugStorage = this.instantiationService.createInstance(DebugStorage);
+        this.debugStorage = this.disposables.add(this.instantiationService.createInstance(DebugStorage));
         this.chosenEnvironments = this.debugStorage.loadChosenEnvironments();
         this.model = this.instantiationService.createInstance(DebugModel, this.debugStorage);
         this.telemetry = this.instantiationService.createInstance(DebugTelemetry, this.model);