@codingame/monaco-vscode-view-common-service-override 20.1.0 → 20.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "20.1.0",
+  "version": "20.2.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - view-common service-override",
   "keywords": [],
@@ -15,46 +15,46 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common": "20.1.0",
-    "@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "20.1.0",
-    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "20.1.0",
-    "@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common": "20.1.0",
-    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "20.1.0",
-    "@codingame/monaco-vscode-3109a756-1f83-5d09-945b-9f0fcad928f0-common": "20.1.0",
-    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "20.1.0",
-    "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "20.1.0",
-    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "20.1.0",
-    "@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common": "20.1.0",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "20.1.0",
-    "@codingame/monaco-vscode-615ce609-8555-545a-a549-47bd9f80e9f8-common": "20.1.0",
-    "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common": "20.1.0",
-    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "20.1.0",
-    "@codingame/monaco-vscode-6db1b967-5327-5c5c-8c17-bd92774c0fb2-common": "20.1.0",
-    "@codingame/monaco-vscode-72a1b7d3-3f58-5545-9b7e-f579bd003081-common": "20.1.0",
-    "@codingame/monaco-vscode-7869cfe8-f42c-5721-9f2b-7d04a6a41f16-common": "20.1.0",
-    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "20.1.0",
-    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "20.1.0",
-    "@codingame/monaco-vscode-89a82baf-8ded-5b2f-b8af-e5fbd72dc5ad-common": "20.1.0",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "20.1.0",
-    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "20.1.0",
-    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "20.1.0",
-    "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common": "20.1.0",
-    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "20.1.0",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "20.1.0",
-    "@codingame/monaco-vscode-ac93482b-2178-52df-a200-ba0d1a4963fb-common": "20.1.0",
-    "@codingame/monaco-vscode-api": "20.1.0",
-    "@codingame/monaco-vscode-bc6d9a89-1625-5010-b57e-ff44151144fe-common": "20.1.0",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "20.1.0",
-    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "20.1.0",
-    "@codingame/monaco-vscode-d26a96d3-122c-5a3d-a04d-deb5ff0f19c0-common": "20.1.0",
-    "@codingame/monaco-vscode-d481a59e-259c-524e-bee1-76483d75d3a1-common": "20.1.0",
-    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.1.0",
-    "@codingame/monaco-vscode-dbfe5f85-b426-55ed-a79b-5f811b395762-common": "20.1.0",
-    "@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common": "20.1.0",
-    "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "20.1.0",
-    "@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common": "20.1.0",
-    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "20.1.0",
-    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "20.1.0"
+    "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common": "20.2.0",
+    "@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "20.2.0",
+    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "20.2.0",
+    "@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common": "20.2.0",
+    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "20.2.0",
+    "@codingame/monaco-vscode-3109a756-1f83-5d09-945b-9f0fcad928f0-common": "20.2.0",
+    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "20.2.0",
+    "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "20.2.0",
+    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "20.2.0",
+    "@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common": "20.2.0",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "20.2.0",
+    "@codingame/monaco-vscode-615ce609-8555-545a-a549-47bd9f80e9f8-common": "20.2.0",
+    "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common": "20.2.0",
+    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "20.2.0",
+    "@codingame/monaco-vscode-6db1b967-5327-5c5c-8c17-bd92774c0fb2-common": "20.2.0",
+    "@codingame/monaco-vscode-72a1b7d3-3f58-5545-9b7e-f579bd003081-common": "20.2.0",
+    "@codingame/monaco-vscode-7869cfe8-f42c-5721-9f2b-7d04a6a41f16-common": "20.2.0",
+    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "20.2.0",
+    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "20.2.0",
+    "@codingame/monaco-vscode-89a82baf-8ded-5b2f-b8af-e5fbd72dc5ad-common": "20.2.0",
+    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "20.2.0",
+    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "20.2.0",
+    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "20.2.0",
+    "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common": "20.2.0",
+    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "20.2.0",
+    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "20.2.0",
+    "@codingame/monaco-vscode-ac93482b-2178-52df-a200-ba0d1a4963fb-common": "20.2.0",
+    "@codingame/monaco-vscode-api": "20.2.0",
+    "@codingame/monaco-vscode-bc6d9a89-1625-5010-b57e-ff44151144fe-common": "20.2.0",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "20.2.0",
+    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "20.2.0",
+    "@codingame/monaco-vscode-d26a96d3-122c-5a3d-a04d-deb5ff0f19c0-common": "20.2.0",
+    "@codingame/monaco-vscode-d481a59e-259c-524e-bee1-76483d75d3a1-common": "20.2.0",
+    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.2.0",
+    "@codingame/monaco-vscode-dbfe5f85-b426-55ed-a79b-5f811b395762-common": "20.2.0",
+    "@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common": "20.2.0",
+    "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "20.2.0",
+    "@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common": "20.2.0",
+    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "20.2.0",
+    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "20.2.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/webview/common/webviewPortMapping.d.ts

@@ -6,6 +6,9 @@ export interface IWebviewPortMapping {
     readonly webviewPort: number;
     readonly extensionHostPort: number;
 }
+/**
+ * Manages port mappings for a single webview.
+ */
 export declare class WebviewPortMappingManager implements IDisposable {
     private readonly _getExtensionLocation;
     private readonly _getMappings;

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/media/callHierarchy.css

@@ -1,47 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
 .monaco-workbench .call-hierarchy .results,
 .monaco-workbench .call-hierarchy .message {
 	display: none;
 }
+
 .monaco-workbench .call-hierarchy[data-state="data"] .results {
 	display: inherit;
 	height: 100%;
 }
+
 .monaco-workbench .call-hierarchy[data-state="message"] .message {
 	display: flex;
 	align-items: center;
 	justify-content: center;
 	height: 100%;
 }
+
 .monaco-workbench .call-hierarchy .editor,
 .monaco-workbench .call-hierarchy .tree {
 	height: 100%;
 }
+
 .monaco-editor .call-hierarchy .tree {
 	background-color: var(--vscode-peekViewResult-background);
 	color: var(--vscode-peekViewResult-fileForeground);
 }
+
 .monaco-workbench .call-hierarchy .tree .callhierarchy-element {
 	display: flex;
 	flex: 1;
 	flex-flow: row nowrap;
 	align-items: center;
 }
+
 .monaco-workbench .call-hierarchy .tree .callhierarchy-element .monaco-icon-label {
 	padding-left: 4px;
 }
+
 .monaco-editor .call-hierarchy .tree .monaco-list:focus .monaco-list-rows > .monaco-list-row.selected:not(.highlighted) {
 	background-color: var(--vscode-peekViewResult-selectionBackground);
 	color: var(--vscode-peekViewResult-selectionForeground) !important;
 }
+
 .monaco-editor .call-hierarchy .call-decoration {
 	background-color: var(--vscode-peekViewEditor-matchHighlightBackground);
 	border: 2px solid var(--vscode-peekViewEditor-matchHighlightBorder);
 	box-sizing: border-box;
 }
+
 .monaco-editor .call-hierarchy .editor .monaco-editor .monaco-editor-background,
 .monaco-editor .call-hierarchy .editor .monaco-editor .inputarea.ime-input {
 	background-color: var(--vscode-peekViewEditor-background);
 }
+
 .monaco-editor .call-hierarchy .editor .monaco-editor .margin {
 	background-color: var(--vscode-peekViewEditorGutter-background);
 }

package/vscode/src/vs/workbench/contrib/customEditor/browser/media/customEditor.css

@@ -1,3 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
 .webview.modified {
 	box-shadow: -6px 0 5px -5px var(--vscode-scrollbar-shadow);
 }

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

@@ -60,6 +60,16 @@ export declare class CustomEditorInfoCollection {
     readonly allEditors: readonly CustomEditorInfo[];
     constructor(editors: readonly CustomEditorInfo[]);
     get length(): number;
+    /**
+     * Find the single default editor to use (if any) by looking at the editor's priority and the
+     * other contributed editors.
+     */
     get defaultEditor(): CustomEditorInfo | undefined;
+    /**
+     * Find the best available editor to use.
+     *
+     * Unlike the `defaultEditor`, a bestAvailableEditor can exist even if there are other editors with
+     * the same priority.
+     */
     get bestAvailableEditor(): CustomEditorInfo | undefined;
 }

package/vscode/src/vs/workbench/contrib/languageStatus/browser/media/languageStatus.css

@@ -1,75 +1,102 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* status bar animation */
+
 @keyframes wiggle {
 	0% {
 		transform: rotate(0) scale(1);
 	}
+
 	15%,
 	45% {
 		transform: rotate(.04turn) scale(1.1);
 	}
+
 	30%,
 	60% {
 		transform: rotate(-.04turn) scale(1.2);
 	}
+
 	100% {
 		transform: rotate(0) scale(1);
 	}
 }
+
 .monaco-workbench .statusbar DIV#status\.languageStatus A > SPAN.codicon.wiggle {
 	animation-duration: .8s;
 	animation-iteration-count: 1;
 	animation-name: wiggle;
 }
+
 @keyframes flash {
 	0% {
 		background-color: initial;
 	}
+
 	50% {
 		background-color: var(--vscode-statusBarItem-prominentBackground);
 	}
+
 	100% {
 		background-color: initial;
 	}
 }
+
 .monaco-workbench .statusbar DIV#status\.languageStatus.flash A {
 	animation-duration: .8s;
 	animation-iteration-count: 1;
 	animation-name: flash;
 }
+
+/* --- hover */
+
 .monaco-workbench .hover-language-status {
 	display: flex;
 }
+
 .monaco-workbench .hover-language-status:not(:last-child) {
 	border-bottom: 1px solid var(--vscode-notifications-border);
 }
+
 .monaco-workbench .hover-language-status > .severity {
 	padding-right: 8px;
 	flex: 1;
 	margin: auto;
 	display: none;
 }
+
 .monaco-workbench .hover-language-status > .severity.sev3 {
 	color: var(--vscode-notificationsErrorIcon-foreground)
 }
+
 .monaco-workbench .hover-language-status > .severity.sev2 {
 	color: var(--vscode-notificationsInfoIcon-foreground)
 }
+
 .monaco-workbench .hover-language-status > .severity.show {
 	display: inherit;
 }
+
 .monaco-workbench .hover-language-status > .element {
 	display: flex;
 	justify-content: space-between;
 	vertical-align: middle;
 	flex-grow: 100;
 }
+
 .monaco-workbench .hover-language-status > .element > .left > .separator::before {
 	content: '\2013';
 	padding: 0 2px;
 	opacity: 0.6;
 }
+
 .monaco-workbench .hover-language-status > .element > .left:empty {
 	display: none;
 }
+
 .monaco-workbench .hover-language-status > .element .left {
 	margin: auto 0;
 	display: flex;
@@ -77,18 +104,22 @@
 	gap: 3px;
 	white-space: nowrap;
 }
+
 .monaco-workbench .hover-language-status > .element .right {
 	margin: auto 0;
 	display: flex;
 }
+
 .monaco-workbench .hover-language-status > .element .right:not(:empty) {
 	padding-left: 16px;
 }
+
 .monaco-workbench .hover-language-status > .element .right .monaco-link {
 	margin: auto 0;
 	white-space: nowrap;
 	text-decoration: var(--text-link-decoration);
 }
+
 .monaco-workbench .hover-language-status > .element .right .monaco-action-bar:not(:first-child) {
 	padding-left: 8px;
 }

package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.d.ts

@@ -3,6 +3,10 @@ import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench
 import { ILanguageStatusService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/languageStatus/common/languageStatusService.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+/**
+ * Uses that language status indicator to show information which language features have been limited for performance reasons.
+ * Currently this is used for folding ranges and for color decorators.
+ */
 export declare class LimitIndicatorContribution extends Disposable implements IWorkbenchContribution {
     constructor(editorService: IEditorService, languageStatusService: ILanguageStatusService);
 }

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css

@@ -1,3 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
 .monaco-workbench .merge-editor .code-view > .header {
 	padding: 0 10px;
 	height: 30px;
@@ -5,6 +10,7 @@
 	align-content: center;
 	overflow: hidden;
 }
+
 .monaco-workbench .merge-editor .code-view > .header > span {
 	align-self: center;
 	text-overflow: ellipsis;
@@ -12,9 +18,11 @@
 	padding-right: 6px;
 	white-space: nowrap;
 }
+
 .monaco-workbench .merge-editor .code-view > .header > span.title {
 	flex-shrink: 0;
 }
+
 .monaco-workbench .merge-editor .code-view > .header > span.description {
 	flex-shrink: 0;
 	display: flex;
@@ -22,6 +30,7 @@
 	align-items: center;
 	color: var(--vscode-descriptionForeground);
 }
+
 .monaco-workbench .merge-editor .code-view.result > .header > .description {
 	display: inline;
 	flex-shrink: 1;
@@ -32,18 +41,23 @@
 .monaco-workbench .merge-editor .code-view.result > .header > .toolbar {
 	flex-shrink: 0;
 }
+
 .monaco-workbench .merge-editor .code-view > .header > span.description .codicon {
 	font-size: 14px;
 	color: var(--vscode-descriptionForeground);
 }
+
 .monaco-workbench .merge-editor .code-view > .header > span.detail {
 	margin-left: auto;
 	font-size: 12px;
 	color: var(--vscode-descriptionForeground);
 }
+
 .monaco-workbench .merge-editor .code-view > .header > span.detail .codicon {
 	font-size: 13px;
 }
+
+/* for input1|2 -> align details to the left  */
 .monaco-workbench .merge-editor .code-view.input > .header > span.detail::before {
 	content: '•';
 	opacity: .5;
@@ -56,10 +70,13 @@
 	flex-shrink: 0;
 	margin-left: auto;
 }
+
+
 .monaco-workbench .merge-editor .code-view > .container {
 	display: flex;
 	flex-direction: row;
 }
+
 .monaco-workbench .merge-editor .code-view > .container > .gutter {
 	width: 24px;
 	position: relative;
@@ -67,80 +84,107 @@
 	flex-shrink: 0;
 	flex-grow: 0;
 }
+
 .monaco-workbench .merge-editor .merge-editor-diff {
 	background-color: var(--vscode-mergeEditor-change-background);
 }
+
 .monaco-workbench .merge-editor .merge-editor-diff-word {
 	background-color: var(--vscode-mergeEditor-change-word-background);
 }
+
+/* BEGIN: .merge-editor-block */
+
 .monaco-workbench .merge-editor .merge-editor-block:not(.handled):not(.focused) {
 	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
 }
+
 .monaco-workbench .merge-editor .merge-editor-block:not(.handled).focused {
 	border: 2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
 }
+
 .monaco-workbench .merge-editor .merge-editor-block.handled:not(.focused) {
 	border: 1px solid var(--vscode-mergeEditor-conflict-handledUnfocused-border);
 }
+
 .monaco-workbench .merge-editor .merge-editor-block.handled.focused {
 	border: 1px solid var(--vscode-mergeEditor-conflict-handledFocused-border);
 }
+
 .monaco-workbench .merge-editor .merge-editor-simplified.input.i1, .merge-editor-block.use-simplified-decorations.input.i1 {
 	background-color: var(--vscode-mergeEditor-conflict-input1-background);
 }
+
 .monaco-workbench .merge-editor .merge-editor-simplified.input.i2, .merge-editor-block.use-simplified-decorations.input.i2 {
 	background-color: var(--vscode-mergeEditor-conflict-input2-background);
 }
+
+/* END: .merge-editor-block */
+
 .gutter.monaco-editor > div {
 	position: absolute;
 }
+
 .merge-accept-gutter-marker {
 	width: 28px;
 	margin-left: 4px;
 }
+
 .merge-accept-gutter-marker .background {
 	height: 100%;
 	width: 50%;
 	position: absolute;
 }
+
 .merge-accept-gutter-marker.multi-line.focused .background {
 	border: 2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
 	border-right: 0;
 }
+
 .merge-accept-gutter-marker.multi-line .background {
 	border: 2px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
 	border-right: 0;
 	border-top-left-radius: 3px;
 	border-bottom-left-radius: 3px;
 }
+
 .merge-accept-gutter-marker.multi-line.handled.focused .background {
 	border: 2px solid var(--vscode-mergeEditor-conflict-handledFocused-border);
 	border-right: 0;
 }
+
 .merge-accept-gutter-marker.multi-line.handled .background {
 	border: 2px solid var(--vscode-checkbox-border);
 	border-right: 0;
 }
+
+
 .focused .accept-conflict-group.monaco-custom-toggle {
 	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
 }
+
 .accept-conflict-group.monaco-custom-toggle {
 	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
 }
+
 .handled.focused .accept-conflict-group.monaco-custom-toggle {
 	border: 1px solid var(--vscode-mergeEditor-conflict-handledFocused-border);
 }
+
 .handled .accept-conflict-group.monaco-custom-toggle {
 	border: 1px solid var(--vscode-checkbox-border);
 }
+
 .merge-accept-gutter-marker.multi-line .background {
 	left: 8px;
 	width: 10px;
 }
+
 .merge-accept-gutter-marker .checkbox {
 	width: 100%;
 	position: absolute;
 }
+
 .accept-conflict-group.monaco-custom-toggle {
 	height: 18px;
 	width: 18px;
@@ -152,10 +196,12 @@
 	background-size: 16px !important;
 	background-color: var(--vscode-checkbox-border);
 }
+
 .merge-accept-gutter-marker .checkbox-background {
 	display: flex;
 	background: var(--vscode-editor-background);
 }
+
 .conflict-zone-root {
 	background-color: var(--vscode-mergeEditor-change-background);
 	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
@@ -164,13 +210,16 @@
 	align-items: center;
 	align-content: center;
 }
+
 .conflict-zone-root .dots {
 	margin: 0 10px;
 }
+
 .conflict-zone-root pre {
 	display: 'inline';
 	font-family: var(--monaco-monospace-font);
 }
+
 .conflict-zone-root .text {
 	background: var(--vscode-mergeEditor-conflictingLines-background);
 	margin-left: auto;
@@ -181,9 +230,12 @@
 	white-space: nowrap;
 	overflow: hidden;
 }
+
+
 .focused.conflict-zone .conflict-zone-root {
 	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
 }
+
 .merge-editor-conflict-actions {
 	margin: 0px 3px;
 	overflow: hidden;
@@ -192,44 +244,55 @@
 	white-space: nowrap;
 	color: var(--vscode-editorCodeLens-foreground)
 }
+
 .merge-editor-conflict-actions > span,
 .merge-editor-conflict-actions > a {
 	user-select: none;
 	-webkit-user-select: none;
 	white-space: nowrap;
 }
+
 .merge-editor-conflict-actions > a {
 	text-decoration: none;
 }
+
 .merge-editor-conflict-actions > a:hover {
 	cursor: pointer;
 	color: var(--vscode-editorLink-activeForeground) !important;
 }
+
 .merge-editor-conflict-actions > a:hover .codicon {
 	color: var(--vscode-editorLink-activeForeground) !important;
 }
+
 .merge-editor-conflict-actions .codicon {
 	vertical-align: middle;
 	color: currentColor !important;
 	color: var(--vscode-editorCodeLens-foreground);
 }
+
 .merge-editor-conflict-actions > a:hover .codicon::before {
 	cursor: pointer;
 }
+
 .fixed-zone-widget {
 	width: 100%;
 }
+
 .merge-editor-diff-empty-word.base {
 	margin-left: 3px;
 	border-left: solid var(--vscode-mergeEditor-changeBase-word-background) 3px;
 }
+
 .merge-editor-diff-empty-word.input {
 	margin-left: 3px;
 	border-left: solid var(--vscode-mergeEditor-change-word-background) 3px;
 }
+
 .merge-editor-diff-word.base {
 	background-color: var(--vscode-mergeEditor-changeBase-word-background);
 }
+
 .merge-editor-diff.base {
 	background-color: var(--vscode-mergeEditor-changeBase-background);
 }

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.d.ts

@@ -25,6 +25,9 @@ export declare class MergeEditorViewModel extends Disposable {
     private counter;
     private readonly lastFocusedEditor;
     readonly baseShowDiffAgainst: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservableWithChange<1 | 2 | undefined, void>;
+    /**
+     * Returns an observable that tracks which editor type is currently focused
+     */
     readonly focusedEditorType: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservableWithChange<MergeEditorType | undefined, void>;
     readonly selectionInBase: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservableWithChange<{
         rangesInBase: Range[];

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewZones.d.ts

@@ -24,6 +24,9 @@ export declare class MergeEditorViewZones {
     readonly resultViewZones: readonly MergeEditorViewZone[];
     constructor(input1ViewZones: readonly MergeEditorViewZone[], input2ViewZones: readonly MergeEditorViewZone[], baseViewZones: readonly MergeEditorViewZone[], resultViewZones: readonly MergeEditorViewZone[]);
 }
+/**
+ * This is an abstract class to create various editor view zones.
+*/
 export declare abstract class MergeEditorViewZone {
     abstract create(viewZoneChangeAccessor: IViewZoneChangeAccessor, viewZoneIdsToCleanUp: string[], disposableStore: DisposableStore): void;
 }

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/media/typeHierarchy.css

@@ -1,47 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
 .monaco-workbench .type-hierarchy .results,
 .monaco-workbench .type-hierarchy .message {
 	display: none;
 }
+
 .monaco-workbench .type-hierarchy[data-state="data"] .results {
 	display: inherit;
 	height: 100%;
 }
+
 .monaco-workbench .type-hierarchy[data-state="message"] .message {
 	display: flex;
 	align-items: center;
 	justify-content: center;
 	height: 100%;
 }
+
 .monaco-workbench .type-hierarchy .editor,
 .monaco-workbench .type-hierarchy .tree {
 	height: 100%;
 }
+
 .monaco-editor .type-hierarchy .tree {
 	background-color: var(--vscode-peekViewResult-background);
 	color: var(--vscode-peekViewResult-fileForeground);
 }
+
 .monaco-editor .type-hierarchy .tree .monaco-list:focus .monaco-list-rows > .monaco-list-row.selected:not(.highlighted) {
 	background-color: var(--vscode-peekViewResult-selectionBackground);
 	color: var(--vscode-peekViewResult-selectionForeground) !important;
 }
+
 .monaco-workbench .type-hierarchy .tree .typehierarchy-element {
 	display: flex;
 	flex: 1;
 	flex-flow: row nowrap;
 	align-items: center;
 }
+
 .monaco-workbench .type-hierarchy .tree .typehierarchy-element .monaco-icon-label {
 	padding-left: 4px;
 }
+
 .monaco-editor .type-hierarchy .type-decoration {
 	background-color: var(--vscode-peekViewEditor-matchHighlightBackground);
 	border: 2px solid var(--vscode-peekViewEditor-matchHighlightBorder);
 	box-sizing: border-box;
 }
+
 .monaco-editor .type-hierarchy .editor .monaco-editor .monaco-editor-background,
 .monaco-editor .type-hierarchy .editor .monaco-editor .inputarea.ime-input {
 	background-color: var(--vscode-peekViewEditor-background);
 }
+
 .monaco-editor .type-hierarchy .editor .monaco-editor .margin {
 	background-color: var(--vscode-peekViewEditorGutter-background);
 }

package/vscode/src/vs/workbench/contrib/webview/browser/overlayWebview.d.ts

@@ -8,6 +8,9 @@ import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/plat
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 import { IOverlayWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/contrib/webview/browser/webview";
 import { IWebviewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service";
+/**
+ * Webview that is absolutely positioned over another element and that can creates and destroys an underlying webview as needed.
+ */
 export declare class OverlayWebview extends Disposable implements IOverlayWebview {
     private readonly _layoutService;
     private readonly _webviewService;

package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.d.ts

@@ -28,7 +28,13 @@ export declare class WebviewElement extends Disposable implements IWebview, Webv
     private readonly _tunnelService;
     private readonly _accessibilityService;
     protected readonly id: string;
+    /**
+     * The provided identifier of this webview.
+     */
     readonly providedViewType?: string;
+    /**
+     * The origin this webview itself is loaded from. May not be unique
+     */
     readonly origin: string;
     private _windowId;
     private get window();
@@ -131,6 +137,13 @@ export declare class WebviewElement extends Disposable implements IWebview, Webv
     readonly hasFindResult: Event<boolean>;
     protected readonly _onDidStopFind: Emitter<void>;
     readonly onDidStopFind: Event<void>;
+    /**
+     * Webviews expose a stateful find API.
+     * Successive calls to find will move forward or backward through onFindResults
+     * depending on the supplied options.
+     *
+     * @param value The string to search for. Empty strings are ignored.
+     */
     find(value: string, previous: boolean): void;
     updateFind(value: string): void;
     stopFind(keepSelection?: boolean): void;

package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewService.d.ts

@@ -4,17 +4,53 @@ import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/
 import { IViewBadge } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views";
 import { IOverlayWebview } from "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/contrib/webview/browser/webview";
 import { IWebviewViewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewView/browser/webviewViewService.service";
+/**
+ * A webview shown in a view pane.
+ */
 export interface WebviewView {
+    /**
+     * The text displayed in the view's title.
+     */
     title?: string;
+    /**
+     * Additional text shown for this view.
+     */
     description?: string;
+    /**
+     * The badge shown for this view.
+     */
     badge?: IViewBadge;
+    /**
+     * The webview associated with this webview view.
+     */
     readonly webview: IOverlayWebview;
+    /**
+     * Fired when the visibility of the webview view changes.
+     *
+     * This can happen when the view itself is hidden, when the view is collapsed, or when the user switches away from
+     * the view.
+     */
     readonly onDidChangeVisibility: Event<boolean>;
+    /**
+     * Fired when the webview view has been disposed of.
+     */
     readonly onDispose: Event<void>;
+    /**
+     * Dispose of the webview view and clean up any associated resources.
+     */
     dispose(): void;
+    /**
+     * Force the webview view to show.
+     */
     show(preserveFocus: boolean): void;
 }
+/**
+ * Fill in the contents of a newly created webview view.
+ */
 export interface IWebviewViewResolver {
+    /**
+     * Fill in the contents of a webview view.
+     */
     resolve(webviewView: WebviewView, cancellation: CancellationToken): Promise<void>;
 }
 export declare class WebviewViewService extends Disposable implements IWebviewViewService {

package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.d.ts

@@ -40,14 +40,39 @@ export declare class EditorResolverService extends Disposable implements IEditor
     registerEditor(globPattern: string | glob.IRelativePattern, editorInfo: RegisteredEditorInfo, options: RegisteredEditorOptions, editorFactoryObject: EditorInputFactoryObject): IDisposable;
     getAssociationsForResource(resource: URI): EditorAssociations;
     getAllUserAssociations(): EditorAssociations;
+    /**
+     * Given the nested nature of the editors map, we merge factories of the same glob and id to make it flat
+     * and easier to work with
+     */
     private _flattenEditorsMap;
+    /**
+     * Returns all editors as an array. Possible to contain duplicates
+     */
     private get _registeredEditors();
     updateUserAssociations(globPattern: string, editorID: string): void;
     private findMatchingEditors;
     getEditors(resource?: URI): RegisteredEditorInfo[];
+    /**
+     * Given a resource and an editorId selects the best possible editor
+     * @returns The editor and whether there was another default which conflicted with it
+     */
     private getEditor;
     private doResolveEditor;
+    /**
+     * Moves the first existing editor for a resource to the target group unless already opened there.
+     * Additionally will close any other editors that are open for that resource and viewtype besides the first one found
+     * @param resource The resource of the editor
+     * @param viewType the viewtype of the editor
+     * @param targetGroup The group to move it to
+     * @returns The moved editor input or `undefined` if the editor could not be moved
+     */
     private moveExistingEditorForResource;
+    /**
+     * Given a resource and an editorId, returns all editors open for that resource and editorId.
+     * @param resource The resource specified
+     * @param editorId The editorID
+     * @returns A list of editors
+     */
     private findExistingEditorsForResource;
     private doHandleConflictingDefaults;
     private mapEditorsToQuickPickEntry;

package/vscode/src/vs/workbench/services/progress/browser/media/progressService.css

@@ -1,3 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
 .monaco-workbench .progress-badge > .badge-content::before {
 	mask: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMiAyIDE0IDE0IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDIgMiAxNCAxNCI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTkgMTZjLTMuODYgMC03LTMuMTQtNy03czMuMTQtNyA3LTdjMy44NTkgMCA3IDMuMTQxIDcgN3MtMy4xNDEgNy03IDd6bTAtMTIuNmMtMy4wODggMC01LjYgMi41MTMtNS42IDUuNnMyLjUxMiA1LjYgNS42IDUuNiA1LjYtMi41MTIgNS42LTUuNi0yLjUxMi01LjYtNS42LTUuNnptMy44NiA3LjFsLTMuMTYtMS44OTZ2LTMuODA0aC0xLjR2NC41OTZsMy44NCAyLjMwNS43Mi0xLjIwMXoiLz48L3N2Zz4=") no-repeat;
 	-webkit-mask: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMiAyIDE0IDE0IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDIgMiAxNCAxNCI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTkgMTZjLTMuODYgMC03LTMuMTQtNy03czMuMTQtNyA3LTdjMy44NTkgMCA3IDMuMTQxIDcgN3MtMy4xNDEgNy03IDd6bTAtMTIuNmMtMy4wODggMC01LjYgMi41MTMtNS42IDUuNnMyLjUxMiA1LjYgNS42IDUuNiA1LjYtMi41MTIgNS42LTUuNi0yLjUxMi01LjYtNS42LTUuNnptMy44NiA3LjFsLTMuMTYtMS44OTZ2LTMuODA0aC0xLjR2NC41OTZsMy44NCAyLjMwNS43Mi0xLjIwMXoiLz48L3N2Zz4=") no-repeat;

package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorService.d.ts

@@ -6,14 +6,38 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IUntitledTextEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/untitled/common/untitledTextEditorService.service";
 export interface INewUntitledTextEditorOptions {
+    /**
+     * Initial value of the untitled editor. An untitled editor with initial
+     * value is dirty right from the beginning.
+     */
     initialValue?: string;
+    /**
+     * Preferred language id to use when saving the untitled editor.
+     */
     languageId?: string;
+    /**
+     * Preferred encoding to use when saving the untitled editor.
+     */
     encoding?: string;
 }
 export interface IExistingUntitledTextEditorOptions extends INewUntitledTextEditorOptions {
+    /**
+     * A resource to identify the untitled editor to create or return
+     * if already existing.
+     *
+     * Note: the resource will not be used unless the scheme is `untitled`.
+     */
     untitledResource?: URI;
 }
 export interface INewUntitledTextEditorWithAssociatedResourceOptions extends INewUntitledTextEditorOptions {
+    /**
+     * Resource components to associate with the untitled editor. When saving
+     * the untitled editor, the associated components will be used and the user
+     * is not being asked to provide a file path.
+     *
+     * Note: currently it is not possible to specify the `scheme` to use. The
+     * untitled editor will saved to the default local or remote resource.
+     */
     associatedResource?: {
         authority: string;
         path: string;
@@ -23,10 +47,19 @@ export interface INewUntitledTextEditorWithAssociatedResourceOptions extends INe
 }
 type IInternalUntitledTextEditorOptions = IExistingUntitledTextEditorOptions & INewUntitledTextEditorWithAssociatedResourceOptions;
 export interface IUntitledTextEditorModelSaveEvent {
+    /**
+     * The source untitled file that was saved. It is disposed at this point.
+     */
     readonly source: URI;
+    /**
+     * The target file the untitled was saved to. Is never untitled.
+     */
     readonly target: URI;
 }
 export interface IUntitledTextEditorModelManager extends IUntitledTextEditorService {
+    /**
+     * Internal method: triggers the onDidSave event.
+     */
     notifyDidSave(source: URI, target: URI): void;
 }
 export declare class UntitledTextEditorService extends Disposable implements IUntitledTextEditorModelManager {