@codingame/monaco-vscode-api 1.82.6 → 1.83.1

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{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}";
+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{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

@@ -17,6 +17,8 @@ import { CommentContextKeys } from '../common/commentContextKeys.js';
 import { ILanguageConfigurationService } from 'monaco-editor/esm/vs/editor/common/languages/languageConfigurationRegistry.js';
 import { ILanguageFeaturesService } from 'monaco-editor/esm/vs/editor/common/services/languageFeatures.js';
 const ctxCommentEditorFocused = ( new RawContextKey('commentEditorFocused', false));
+const MIN_EDITOR_HEIGHT = 5 * 18;
+const MAX_EDITOR_HEIGHT = 25 * 18;
 let SimpleCommentEditor = class SimpleCommentEditor extends CodeEditorWidget {
     constructor(domElement, options, scopedContextKeyService, parentThread, instantiationService, codeEditorService, commandService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService) {
         const codeEditorWidgetOptions = {
@@ -31,10 +33,10 @@ let SimpleCommentEditor = class SimpleCommentEditor extends CodeEditorWidget {
         super(domElement, options, codeEditorWidgetOptions, instantiationService, codeEditorService, commandService, scopedContextKeyService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService);
         this._commentEditorFocused = ctxCommentEditorFocused.bindTo(scopedContextKeyService);
         this._commentEditorEmpty = CommentContextKeys.commentIsEmpty.bindTo(scopedContextKeyService);
-        this._commentEditorEmpty.set(!this.getValue());
+        this._commentEditorEmpty.set(!this.getModel()?.getValueLength());
         this._parentThread = parentThread;
         this._register(this.onDidFocusEditorWidget(_ => this._commentEditorFocused.set(true)));
-        this._register(this.onDidChangeModelContent(e => this._commentEditorEmpty.set(!this.getValue())));
+        this._register(this.onDidChangeModelContent(e => this._commentEditorEmpty.set(!this.getModel()?.getValueLength())));
         this._register(this.onDidBlurEditorWidget(_ => this._commentEditorFocused.reset()));
     }
     getParentThread() {
@@ -56,7 +58,8 @@ let SimpleCommentEditor = class SimpleCommentEditor extends CodeEditorWidget {
                 horizontal: 'auto',
                 useShadows: true,
                 verticalHasArrows: false,
-                horizontalHasArrows: false
+                horizontalHasArrows: false,
+                alwaysConsumeMouseWheel: false
             },
             overviewRulerLanes: 2,
             lineDecorationsWidth: 0,
@@ -83,4 +86,18 @@ SimpleCommentEditor = ( __decorate([
     ( __param(10, ILanguageConfigurationService)),
     ( __param(11, ILanguageFeaturesService))
 ], SimpleCommentEditor));
-export { SimpleCommentEditor, ctxCommentEditorFocused };
+function calculateEditorHeight(parentEditor, editor, currentHeight) {
+    const layoutInfo = editor.getLayoutInfo();
+    const lineHeight = editor.getOption(66 );
+    const contentHeight = (editor.getModel()?.getLineCount() * lineHeight) ?? editor.getContentHeight();
+    if ((contentHeight > layoutInfo.height) ||
+        (contentHeight < layoutInfo.height && currentHeight > MIN_EDITOR_HEIGHT)) {
+        const linesToAdd = Math.ceil((contentHeight - layoutInfo.height) / lineHeight);
+        const lowerBoundOfMaxEditorHeight = Math.max(parentEditor.getLayoutInfo().height - 90, MIN_EDITOR_HEIGHT);
+        const maxCommentEditorHeightForParentEditor = Math.min(MAX_EDITOR_HEIGHT, lowerBoundOfMaxEditorHeight);
+        const proposedHeight = layoutInfo.height + (lineHeight * linesToAdd);
+        return Math.min(maxCommentEditorHeightForParentEditor, Math.max(MIN_EDITOR_HEIGHT, proposedHeight));
+    }
+    return currentHeight;
+}
+export { MAX_EDITOR_HEIGHT, MIN_EDITOR_HEIGHT, SimpleCommentEditor, calculateEditorHeight, ctxCommentEditorFocused };

package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js

@@ -2,6 +2,27 @@ import * as nls from 'monaco-editor/esm/vs/nls.js';
 import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 var CommentContextKeys;
 ( (function(CommentContextKeys) {
+    CommentContextKeys.activeCursorHasCommentingRange = ( new RawContextKey('activeCursorHasCommentingRange', false, {
+        description: ( nls.localize(
+         'hasCommentingRange',
+         "Whether the position at the active cursor has a commenting range"
+        )),
+        type: 'boolean'
+    }));
+    CommentContextKeys.activeEditorHasCommentingRange = ( new RawContextKey('activeEditorHasCommentingRange', false, {
+        description: ( nls.localize(
+         'editorHasCommentingRange',
+         "Whether the active editor has a commenting range"
+        )),
+        type: 'boolean'
+    }));
+    CommentContextKeys.WorkspaceHasCommenting = ( new RawContextKey('workspaceHasCommenting', false, {
+        description: ( nls.localize(
+         'hasCommentingProvider',
+         "Whether the open workspace has either comments or commenting ranges."
+        )),
+        type: 'boolean'
+    }));
     CommentContextKeys.commentThreadIsEmpty = ( new RawContextKey(
      'commentThreadIsEmpty',
      false,
@@ -18,5 +39,6 @@ var CommentContextKeys;
       "The comment controller id associated with a comment thread"
      )) }
     ));
+    CommentContextKeys.commentFocused = ( new RawContextKey('commentFocused', false, { type: 'boolean', description: ( nls.localize('commentFocused', "Set when the comment is focused")) }));
 })(CommentContextKeys || (CommentContextKeys = {})));
 export { CommentContextKeys };

package/vscode/src/vs/workbench/contrib/debug/common/debug.d.ts

@@ -410,6 +410,9 @@ interface IDataBreakpoint extends IBaseBreakpoint {
 interface IInstructionBreakpoint extends IBaseBreakpoint {
     readonly instructionReference: string;
     readonly offset?: number;
+    /** Original instruction memory address; display purposes only */
+    readonly address: bigint;
+    toJSON(): DebugProtocol.InstructionBreakpoint;
 }
 interface IExceptionInfo {
     readonly id?: string;
@@ -810,13 +813,13 @@ interface IDebugService {
     /**
      * Adds a new instruction breakpoint.
      */
-    addInstructionBreakpoint(address: string, offset: number, condition?: string, hitCondition?: string): Promise<void>;
+    addInstructionBreakpoint(instructionReference: string, offset: number, address: bigint, condition?: string, hitCondition?: string): Promise<void>;
     /**
      * Removes all instruction breakpoints. If address is passed only removes the instruction breakpoint with the passed address.
      * The address should be the address string supplied by the debugger from the "Disassemble" request.
      * Notifies debug adapter of breakpoint changes.
      */
-    removeInstructionBreakpoints(address?: string): Promise<void>;
+    removeInstructionBreakpoints(instructionReference?: string, offset?: number): Promise<void>;
     setExceptionBreakpointCondition(breakpoint: IExceptionBreakpoint, condition: string | undefined): Promise<void>;
     setExceptionBreakpointsForSession(session: IDebugSession, data: DebugProtocol.ExceptionBreakpointsFilter[]): void;
     /**

package/vscode/src/vs/workbench/contrib/debug/common/debugUtils.js

@@ -289,4 +289,5 @@ async function saveAllBeforeDebugStart(configurationService, editorService) {
     }
     await configurationService.reloadConfiguration();
 }
-export { convertToDAPaths, convertToVSCPaths, filterExceptionsFromTelemetry, formatPII, getEvaluatableExpressionAtPosition, getExactExpressionStartAndEnd, getExtensionHostDebugSession, getVisibleAndSorted, isDebuggerMainContribution, isSessionAttach, isUri, saveAllBeforeDebugStart };
+const sourcesEqual = (a, b) => !a || !b ? a === b : a.name === b.name && a.path === b.path && a.sourceReference === b.sourceReference;
+export { convertToDAPaths, convertToVSCPaths, filterExceptionsFromTelemetry, formatPII, getEvaluatableExpressionAtPosition, getExactExpressionStartAndEnd, getExtensionHostDebugSession, getVisibleAndSorted, isDebuggerMainContribution, isSessionAttach, isUri, saveAllBeforeDebugStart, sourcesEqual };

package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js

@@ -203,7 +203,7 @@ ExplorerViewPaneContainer = ( __decorate([
 const viewContainerRegistry = ( Registry.as(Extensions.ViewContainersRegistry));
 const VIEW_CONTAINER = viewContainerRegistry.registerViewContainer({
     id: VIEWLET_ID,
-    title: ( localize('explore', "Explorer")),
+    title: { value: ( localize('explore', "Explorer")), original: 'Explorer' },
     ctorDescriptor: ( new SyncDescriptor(ExplorerViewPaneContainer)),
     storageId: 'workbench.explorer.views.state',
     icon: explorerViewIcon,

package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js

@@ -25,7 +25,7 @@ import { FileAccess, Schemas } from 'monaco-editor/esm/vs/base/common/network.js
 import { mnemonicButtonLabel } from 'monaco-editor/esm/vs/base/common/labels.js';
 import { listenStream } from 'monaco-editor/esm/vs/base/common/stream.js';
 import { toDisposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { once } from 'monaco-editor/esm/vs/base/common/functional.js';
+import { createSingleCallFunction } from 'monaco-editor/esm/vs/base/common/functional.js';
 import { coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { canceled } from 'monaco-editor/esm/vs/base/common/errors.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
@@ -549,7 +549,7 @@ let FileDownload = class FileDownload {
             const sourceStream = contents.value;
             const disposables = ( new DisposableStore());
             disposables.add(toDisposable(() => target.close()));
-            disposables.add(once(token.onCancellationRequested)(() => {
+            disposables.add(createSingleCallFunction(token.onCancellationRequested)(() => {
                 disposables.dispose();
                 reject(canceled());
             }));

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

@@ -27,9 +27,9 @@ const hotExitConfiguration = isNative ?
                 'Hot exit will be triggered when the last window is closed on Windows/Linux or when the `workbench.action.quit` command is triggered (command palette, keybinding, menu), and also for any window with a folder opened regardless of whether it\'s the last window. All windows without folders opened will be restored upon next launch. A list of previously opened windows with unsaved files can be accessed via `File > Open Recent > More...`'
             ))
         ],
-        'description': ( nls.localize(
+        'markdownDescription': ( nls.localize(
             'hotExit',
-            "Controls whether unsaved files are remembered between sessions, allowing the save prompt when exiting the editor to be skipped.",
+            "[Hot Exit](https://aka.ms/vscode-hot-exit) controls whether unsaved files are remembered between sessions, allowing the save prompt when exiting the editor to be skipped.",
             HotExitConfiguration.ON_EXIT,
             HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE
         ))
@@ -48,9 +48,9 @@ const hotExitConfiguration = isNative ?
             'Hot exit will be triggered when the browser quits or the window or tab is closed.'
         ))
     ],
-    'description': ( nls.localize(
+    'markdownDescription': ( nls.localize(
         'hotExit',
-        "Controls whether unsaved files are remembered between sessions, allowing the save prompt when exiting the editor to be skipped.",
+        "[Hot Exit](https://aka.ms/vscode-hot-exit) controls whether unsaved files are remembered between sessions, allowing the save prompt when exiting the editor to be skipped.",
         HotExitConfiguration.ON_EXIT,
         HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE
     ))

package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js

@@ -38,7 +38,7 @@ let EmptyView = class EmptyView extends ViewPane {
             onDrop: e => {
                 container.style.backgroundColor = '';
                 const dropHandler = this.instantiationService.createInstance(ResourcesDropHandler, { allowWorkspaceOpen: !isWeb || isTemporaryWorkspace(this.contextService.getWorkspace()) });
-                dropHandler.handleDrop(e, () => undefined, () => undefined);
+                dropHandler.handleDrop(e);
             },
             onDragEnter: () => {
                 const color = this.themeService.getColorTheme().getColor(listDropBackground);

package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js

@@ -13,7 +13,7 @@ import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configurati
 import { dirname, joinPath, distinctParents } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { InputBox } from 'monaco-editor/esm/vs/base/browser/ui/inputbox/inputBox.js';
 import { localize } from 'monaco-editor/esm/vs/nls.js';
-import { once } from 'monaco-editor/esm/vs/base/common/functional.js';
+import { createSingleCallFunction } from 'monaco-editor/esm/vs/base/common/functional.js';
 import { equals, deepClone } from 'monaco-editor/esm/vs/base/common/objects.js';
 import * as path from 'monaco-editor/esm/vs/base/common/path.js';
 import { ExplorerItem, NewExplorerItem } from '../../common/explorerModel.js';
@@ -423,7 +423,7 @@ let FilesRenderer = class FilesRenderer {
         inputBox.value = value;
         inputBox.focus();
         inputBox.select({ start: 0, end: lastDot > 0 && !stat.isDirectory ? lastDot : value.length });
-        const done = once((success, finishEditing) => {
+        const done = createSingleCallFunction((success, finishEditing) => {
             label.element.style.display = 'none';
             const value = inputBox.value;
             dispose(toDispose);
@@ -831,15 +831,15 @@ let FileDragAndDrop = class FileDragAndDrop {
         this.workspaceEditingService = workspaceEditingService;
         this.uriIdentityService = uriIdentityService;
         this.compressedDropTargetDisposable = Disposable.None;
+        this.disposables = ( new DisposableStore());
         this.dropEnabled = false;
-        this.toDispose = [];
         const updateDropEnablement = (e) => {
             if (!e || e.affectsConfiguration('explorer.enableDragAndDrop')) {
                 this.dropEnabled = this.configurationService.getValue('explorer.enableDragAndDrop');
             }
         };
         updateDropEnablement(undefined);
-        this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => updateDropEnablement(e)));
+        this.disposables.add(this.configurationService.onDidChangeConfiguration(e => updateDropEnablement(e)));
     }
     onDragOver(data, target, targetIndex, originalEvent) {
         if (!this.dropEnabled) {
@@ -1168,6 +1168,9 @@ let FileDragAndDrop = class FileDragAndDrop {
     onDragEnd() {
         this.compressedDropTargetDisposable.dispose();
     }
+    dispose() {
+        this.compressedDropTargetDisposable.dispose();
+    }
 };
 FileDragAndDrop = FileDragAndDrop_1 = ( __decorate([
     ( __param(1, IExplorerService)),

package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js

@@ -575,9 +575,10 @@ class OpenEditorsDragAndDrop {
             this.editorGroupService.activateGroup(group);
         }
         else {
-            this.dropHandler.handleDrop(originalEvent, () => group, () => group.focus(), index);
+            this.dropHandler.handleDrop(originalEvent, () => group, () => group.focus(), { index });
         }
     }
+    dispose() { }
 }
 OpenEditorsDragAndDrop.__decorator = ( __decorate([
     memoize

package/vscode/src/vs/workbench/contrib/files/common/files.js

@@ -2,12 +2,12 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
 import { ContextKeyExpr, RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { Disposable, MutableDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Disposable, MutableDisposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
 import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
 import { InputFocusedContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
-import { once } from 'monaco-editor/esm/vs/base/common/functional.js';
+import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { localize } from 'monaco-editor/esm/vs/nls.js';
 var TextFileContentProvider_1;
 const VIEWLET_ID = 'workbench.view.explorer';
@@ -150,13 +150,15 @@ let TextFileContentProvider = TextFileContentProvider_1 = class TextFileContentP
         const savedFileResource = TextFileContentProvider_1.textFileToResource(resource);
         const codeEditorModel = await this.resolveEditorModel(resource);
         if (!this.fileWatcherDisposable.value) {
-            this.fileWatcherDisposable.value = this.fileService.onDidFilesChange(changes => {
+            const disposables = ( new DisposableStore());
+            this.fileWatcherDisposable.value = disposables;
+            disposables.add(this.fileService.onDidFilesChange(changes => {
                 if (changes.contains(savedFileResource, 0 )) {
                     this.resolveEditorModel(resource, false );
                 }
-            });
+            }));
             if (codeEditorModel) {
-                once(codeEditorModel.onWillDispose)(() => this.fileWatcherDisposable.clear());
+                disposables.add(Event.once(codeEditorModel.onWillDispose)(() => this.fileWatcherDisposable.clear()));
             }
         }
         return codeEditorModel;

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js

@@ -69,10 +69,10 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         this.textFileService = textFileService;
         this.dialogService = dialogService;
         this.editorService = editorService;
-        this.savedAltVersionId = observableValue('initialAltVersionId', this.model.resultTextModel.getAlternativeVersionId());
+        this.savedAltVersionId = observableValue(this, this.model.resultTextModel.getAlternativeVersionId());
         this.altVersionId = observableFromEvent(e => this.model.resultTextModel.onDidChangeContent(e), () =>
          this.model.resultTextModel.getAlternativeVersionId());
-        this.isDirty = derived((reader) =>  this.altVersionId.read(reader) !== this.savedAltVersionId.read(reader));
+        this.isDirty = derived(this, (reader) => this.altVersionId.read(reader) !== this.savedAltVersionId.read(reader));
         this.finished = false;
     }
     dispose() {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.js

@@ -26,9 +26,9 @@ let MergeDiffComputer = class MergeDiffComputer {
             return { diffs: null };
         }
         const changes = ( result.changes.map(c => ( new DetailedLineRangeMapping(
-            toLineRange(c.originalRange),
+            toLineRange(c.original),
             textModel1,
-            toLineRange(c.modifiedRange),
+            toLineRange(c.modified),
             textModel2,
             c.innerChanges?.map(ic => toRangeMapping(ic))
         ))));

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.js

@@ -1,4 +1,5 @@
-import { findLast, lastOrDefault, compareBy, numberComparator } from 'monaco-editor/esm/vs/base/common/arrays.js';
+import { lastOrDefault, compareBy, numberComparator } from 'monaco-editor/esm/vs/base/common/arrays.js';
+import { findLast } from 'monaco-editor/esm/vs/base/common/arraysFind.js';
 import { assertFn, checkAdjacentItems } from 'monaco-editor/esm/vs/base/common/assert.js';
 import { BugIndicatingError } from 'monaco-editor/esm/vs/base/common/errors.js';
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { equals, CompareResult } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { BugIndicatingError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { derived, waitForState, keepAlive, autorunHandleChanges, transaction, observableValue } from 'monaco-editor/esm/vs/base/common/observable.js';
+import { derived, waitForState, keepObserved, autorunHandleChanges, transaction, observableValue } from 'monaco-editor/esm/vs/base/common/observable.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';
 import { localize } from 'monaco-editor/esm/vs/nls.js';
@@ -27,12 +27,12 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         this.input1TextModelDiffs = this._register(( new TextModelDiffs(this.base, this.input1.textModel, this.diffComputer)));
         this.input2TextModelDiffs = this._register(( new TextModelDiffs(this.base, this.input2.textModel, this.diffComputer)));
         this.resultTextModelDiffs = this._register(( new TextModelDiffs(this.base, this.resultTextModel, this.diffComputer)));
-        this.modifiedBaseRanges = derived((reader) => {
+        this.modifiedBaseRanges = derived(this, (reader) => {
             const input1Diffs = this.input1TextModelDiffs.diffs.read(reader);
             const input2Diffs = this.input2TextModelDiffs.diffs.read(reader);
             return ModifiedBaseRange.fromDiffs(input1Diffs, input2Diffs, this.base, this.input1.textModel, this.input2.textModel);
         });
-        this.modifiedBaseRangeResultStates = derived(reader => {
+        this.modifiedBaseRangeResultStates = derived(this, reader => {
             const map = ( new Map(( this.modifiedBaseRanges.read(reader).map((s) => [
                 s, ( new ModifiedBaseRangeData(s))
             ]))));
@@ -42,23 +42,23 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         this.baseInput1Diffs = this.input1TextModelDiffs.diffs;
         this.baseInput2Diffs = this.input2TextModelDiffs.diffs;
         this.baseResultDiffs = this.resultTextModelDiffs.diffs;
-        this.input1ResultMapping = derived(reader => {
+        this.input1ResultMapping = derived(this, reader => {
             return this.getInputResultMapping(this.baseInput1Diffs.read(reader), this.baseResultDiffs.read(reader), this.input1.textModel.getLineCount());
         });
-        this.resultInput1Mapping = derived(reader =>  this.input1ResultMapping.read(reader).reverse());
-        this.input2ResultMapping = derived(reader => {
+        this.resultInput1Mapping = derived(this, reader => this.input1ResultMapping.read(reader).reverse());
+        this.input2ResultMapping = derived(this, reader => {
             return this.getInputResultMapping(this.baseInput2Diffs.read(reader), this.baseResultDiffs.read(reader), this.input2.textModel.getLineCount());
         });
-        this.resultInput2Mapping = derived(reader =>  this.input2ResultMapping.read(reader).reverse());
-        this.baseResultMapping = derived(reader => {
+        this.resultInput2Mapping = derived(this, reader => this.input2ResultMapping.read(reader).reverse());
+        this.baseResultMapping = derived(this, reader => {
             const map = ( new DocumentLineRangeMap(this.baseResultDiffs.read(reader), -1));
             return ( new DocumentLineRangeMap(( map.lineRangeMappings.map((m) => m.inputRange.isEmpty || m.outputRange.isEmpty
                 ? ( new LineRangeMapping(
             m.inputRange.deltaStart(-1), m.outputRange.deltaStart(-1)))
                 : m)), map.inputLineCount));
         });
-        this.resultBaseMapping = derived(reader =>  this.baseResultMapping.read(reader).reverse());
-        this.diffComputingState = derived(reader => {
+        this.resultBaseMapping = derived(this, reader => this.baseResultMapping.read(reader).reverse());
+        this.diffComputingState = derived(this, reader => {
             const states = ( [
                 this.input1TextModelDiffs,
                 this.input2TextModelDiffs,
@@ -72,7 +72,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
             }
             return 2 ;
         });
-        this.inputDiffComputingState = derived(reader => {
+        this.inputDiffComputingState = derived(this, reader => {
             const states = ( [
                 this.input1TextModelDiffs,
                 this.input2TextModelDiffs,
@@ -85,10 +85,10 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
             }
             return 2 ;
         });
-        this.isUpToDate = derived(reader =>  this.diffComputingState.read(reader) === 2 );
+        this.isUpToDate = derived(this, reader => this.diffComputingState.read(reader) === 2 );
         this.onInitialized = waitForState(this.diffComputingState, state => state === 2 ).then(() => { });
         this.firstRun = true;
-        this.unhandledConflictsCount = derived(reader =>  {
+        this.unhandledConflictsCount = derived(this, reader => {
             const map = this.modifiedBaseRangeResultStates.read(reader);
             let unhandledCount = 0;
             for (const [_key, value] of map) {
@@ -99,9 +99,9 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
             return unhandledCount;
         });
         this.hasUnhandledConflicts = ( this.unhandledConflictsCount.map(value =>  value > 0));
-        this._register(keepAlive(this.modifiedBaseRangeResultStates));
-        this._register(keepAlive(this.input1ResultMapping));
-        this._register(keepAlive(this.input2ResultMapping));
+        this._register(keepObserved(this.modifiedBaseRangeResultStates));
+        this._register(keepObserved(this.input1ResultMapping));
+        this._register(keepObserved(this.input2ResultMapping));
         const initializePromise = this.initialize();
         this.onInitialized = this.onInitialized.then(async () => {
             await initializePromise;
@@ -560,7 +560,7 @@ class ModifiedBaseRangeData {
         this.handledInput2 = observableValue(`BaseRangeHandledState${this.baseRange.baseRange}.Input2`, false);
         this.computedFromDiffing = false;
         this.previousNonDiffingState = undefined;
-        this.handled = derived(reader =>  this.handledInput1.read(reader) && this.handledInput2.read(reader));
+        this.handled = derived(this, reader => this.handledInput1.read(reader) && this.handledInput2.read(reader));
     }
 }
 class MarkAsHandledUndoRedoElement {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.js

@@ -16,8 +16,8 @@ class TextModelDiffs extends Disposable {
         this.textModel = textModel;
         this.diffComputer = diffComputer;
         this.recomputeCount = 0;
-        this._state = observableValue('LiveDiffState', 1 );
-        this._diffs = observableValue('LiveDiffs', []);
+        this._state = observableValue(this, 1 );
+        this._diffs = observableValue(this, []);
         this.barrier = ( new ReentrancyBarrier());
         this.isDisposed = false;
         this.isInitializing = true;

package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.js

@@ -141,7 +141,10 @@ const NotebookSetting = {
     findScope: 'notebook.find.scope',
     logging: 'notebook.logging',
     confirmDeleteRunningCell: 'notebook.confirmDeleteRunningCell',
-    remoteSaving: 'notebook.experimental.remoteSave'
+    remoteSaving: 'notebook.experimental.remoteSave',
+    gotoSymbolsAllSymbols: 'notebook.gotoSymbols.showAllSymbols',
+    scrollToRevealCell: 'notebook.scrolling.revealNextCellOnExecute',
+    anchorToFocusedCell: 'notebook.scrolling.experimental.anchorToFocusedCell'
 };
 class NotebookWorkingCopyTypeIdentifier {
     static { this._prefix = 'notebook/'; }

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

@@ -5,15 +5,11 @@ import { KeyChord } from 'monaco-editor/esm/vs/base/common/keyCodes.js';
 import { ModesRegistry } from 'monaco-editor/esm/vs/editor/common/languages/modesRegistry.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { registerAction2, Action2, MenuRegistry, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { LogContentProvider } from './outputServices.js';
-import { OUTPUT_MODE_ID, OUTPUT_MIME, LOG_MODE_ID, LOG_MIME, OUTPUT_VIEW_ID, LOG_SCHEME, IOutputService, CONTEXT_IN_OUTPUT, CONTEXT_OUTPUT_SCROLL_LOCK, CONTEXT_ACTIVE_LOG_OUTPUT, ACTIVE_OUTPUT_CHANNEL_CONTEXT, Extensions as Extensions$3 } from '../../../services/output/common/output.js';
+import { OUTPUT_MODE_ID, OUTPUT_MIME, LOG_MODE_ID, LOG_MIME, OUTPUT_VIEW_ID, IOutputService, CONTEXT_IN_OUTPUT, CONTEXT_OUTPUT_SCROLL_LOCK, CONTEXT_ACTIVE_LOG_OUTPUT, ACTIVE_OUTPUT_CHANNEL_CONTEXT, Extensions as Extensions$3 } from '../../../services/output/common/output.js';
 import { OutputViewPane } from './outputView.js';
-import { EditorPaneDescriptor } from '../../../browser/editor.js';
-import { LogViewer, LogViewerInput } from './logViewer.js';
 import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
 import { Extensions as Extensions$1 } from '../../../common/contributions.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
 import { Extensions, IViewsService } from '../../../common/views.js';
 import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
 import { Extensions as Extensions$2 } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
@@ -24,8 +20,8 @@ import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
 import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
-import { EditorExtensions } from '../../../common/editor.js';
 import { Disposable, toDisposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
 ModesRegistry.registerLanguage({
     id: OUTPUT_MODE_ID,
     extensions: [],
@@ -39,7 +35,7 @@ ModesRegistry.registerLanguage({
 const outputViewIcon = registerIcon('output-view-icon', Codicon.output, ( nls.localize('outputViewIcon', 'View icon of the output view.')));
 const VIEW_CONTAINER = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
     id: OUTPUT_VIEW_ID,
-    title: ( nls.localize('output', "Output")),
+    title: { value: ( nls.localize('output', "Output")), original: 'Output' },
     icon: outputViewIcon,
     order: 1,
     ctorDescriptor: ( new SyncDescriptor(
@@ -68,14 +64,10 @@ const VIEW_CONTAINER = ( Registry.as(Extensions.ViewContainersRegistry)).registe
             order: 1,
         }
     }], VIEW_CONTAINER);
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(LogViewer, LogViewer.LOG_VIEWER_EDITOR_ID, ( nls.localize('logViewer', "Log Viewer"))), [
-    ( new SyncDescriptor(LogViewerInput))
-]);
 let OutputContribution = class OutputContribution extends Disposable {
-    constructor(instantiationService, textModelService, outputService) {
+    constructor(instantiationService, outputService) {
         super();
         this.outputService = outputService;
-        textModelService.registerTextModelContentProvider(LOG_SCHEME, instantiationService.createInstance(LogContentProvider));
         this.registerActions();
     }
     registerActions() {
@@ -263,10 +255,16 @@ let OutputContribution = class OutputContribution extends Disposable {
             async run(accessor) {
                 const outputService = accessor.get(IOutputService);
                 const editorService = accessor.get(IEditorService);
-                const instantiationService = accessor.get(IInstantiationService);
+                const fileConfigurationService = accessor.get(IFilesConfigurationService);
                 const logFileOutputChannelDescriptor = this.getLogFileOutputChannelDescriptor(outputService);
                 if (logFileOutputChannelDescriptor) {
-                    await editorService.openEditor(instantiationService.createInstance(LogViewerInput, logFileOutputChannelDescriptor), { pinned: true });
+                    await fileConfigurationService.updateReadonly(logFileOutputChannelDescriptor.file, true);
+                    await editorService.openEditor({
+                        resource: logFileOutputChannelDescriptor.file,
+                        options: {
+                            pinned: true,
+                        }
+                    });
                 }
             }
             getLogFileOutputChannelDescriptor(outputService) {
@@ -352,8 +350,8 @@ let OutputContribution = class OutputContribution extends Disposable {
             async run(accessor, args) {
                 const outputService = accessor.get(IOutputService);
                 const quickInputService = accessor.get(IQuickInputService);
-                const instantiationService = accessor.get(IInstantiationService);
                 const editorService = accessor.get(IEditorService);
+                const fileConfigurationService = accessor.get(IFilesConfigurationService);
                 const entries = ( outputService.getChannelDescriptors().filter(c => c.file && c.log)
                     .map(channel => ({ id: channel.id, label: channel.label, channel })));
                 const argName = args && typeof args === 'string' ? args : undefined;
@@ -365,8 +363,14 @@ let OutputContribution = class OutputContribution extends Disposable {
                     entry = await quickInputService.pick(entries, { placeHolder: ( nls.localize('selectlogFile', "Select Log File")) });
                 }
                 if (entry) {
-                    assertIsDefined(entry.channel.file);
-                    await editorService.openEditor(instantiationService.createInstance(LogViewerInput, entry.channel), { pinned: true });
+                    const resource = assertIsDefined(entry.channel.file);
+                    await fileConfigurationService.updateReadonly(resource, true);
+                    await editorService.openEditor({
+                        resource,
+                        options: {
+                            pinned: true,
+                        }
+                    });
                 }
             }
         }));
@@ -374,8 +378,7 @@ let OutputContribution = class OutputContribution extends Disposable {
 };
 OutputContribution = ( __decorate([
     ( __param(0, IInstantiationService)),
-    ( __param(1, ITextModelService)),
-    ( __param(2, IOutputService))
+    ( __param(1, IOutputService))
 ], OutputContribution));
 ( Registry.as(Extensions$1.Workbench)).registerWorkbenchContribution(OutputContribution, 3 );
 ( Registry.as(Extensions$2.Configuration)).registerConfiguration({