@codingame/monaco-vscode-view-common-service-override 6.0.2 → 7.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. package/assets/index-no-csp.html +27 -6
  2. package/assets/index.html +46 -8
  3. package/assets/service-worker.js +1 -2
  4. package/package.json +3 -3
  5. package/vscode/src/vs/base/browser/ui/centered/centeredViewLayout.js +2 -4
  6. package/vscode/src/vs/base/browser/ui/grid/gridview.js +2 -2
  7. package/vscode/src/vs/workbench/browser/actions/listCommands.js +1 -1
  8. package/vscode/src/vs/workbench/browser/media/style.css.js +1 -1
  9. package/vscode/src/vs/workbench/browser/parts/activitybar/media/activityaction.css.js +1 -1
  10. package/vscode/src/vs/workbench/browser/parts/compositePart.js +1 -1
  11. package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js +1 -1
  12. package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js +1 -1
  13. package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js +1 -1
  14. package/vscode/src/vs/workbench/contrib/languageStatus/browser/media/languageStatus.css.js +1 -1
  15. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js +9 -9
  16. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editorGutter.js +3 -3
  17. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.js +3 -3
  18. package/vscode/src/vs/workbench/contrib/webview/browser/themeing.js +3 -1
  19. package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js +10 -0
  20. package/vscode/src/vs/workbench/services/progress/browser/progressService.js +15 -3
package/assets/index-no-csp.html CHANGED
@@ -48,7 +48,8 @@
48
48
  const interval = 250;
49
49
  let isFocused = document.hasFocus();
50
50
  setInterval(() => {
51
- const isCurrentlyFocused = document.hasFocus();
51
+ const target = getActiveFrame();
52
+ const isCurrentlyFocused = document.hasFocus() || !!(target && target.contentDocument && target.contentDocument.body.classList.contains('vscode-context-menu-visible'));
52
53
  if (isCurrentlyFocused === isFocused) {
53
54
  return;
54
55
  }
@@ -130,6 +131,10 @@
130
131
  border-radius: 4px;
131
132
  }
132
133
 
134
+ pre code {
135
+ padding: 0;
136
+ }
137
+
133
138
  blockquote {
134
139
  background: var(--vscode-textBlockQuote-background);
135
140
  border-color: var(--vscode-textBlockQuote-border);
@@ -570,7 +575,7 @@
570
575
  } else {
571
576
  return; // let the browser handle this
572
577
  }
573
- } else if (!onElectron && (isCloseTab(e) || isNewWindow(e))) {
578
+ } else if (!onElectron && (isCloseTab(e) || isNewWindow(e) || isHelp(e) || isRefresh(e))) {
574
579
  // Prevent Ctrl+W closing window / Ctrl+N opening new window in PWA.
575
580
  // (No effect in a regular browser tab.)
576
581
  e.preventDefault();
@@ -675,6 +680,24 @@
675
680
  return hasMeta && e.keyCode === 78;
676
681
  }
677
682
 
683
+ /**
684
+ * @param {KeyboardEvent} e
685
+ * @return {boolean}
686
+ */
687
+ function isHelp(e) {
688
+ // 112: keyCode of "F1"
689
+ return e.keyCode === 112;
690
+ }
691
+
692
+ /**
693
+ * @param {KeyboardEvent} e
694
+ * @return {boolean}
695
+ */
696
+ function isRefresh(e) {
697
+ // 116: keyCode of "F5"
698
+ return e.keyCode === 116;
699
+ }
700
+
678
701
  let isHandlingScroll = false;
679
702
 
680
703
  /**
@@ -924,7 +947,7 @@
924
947
  const previousPendingFrame = getPendingFrame();
925
948
  if (previousPendingFrame) {
926
949
  previousPendingFrame.setAttribute('id', '');
927
- document.body.removeChild(previousPendingFrame);
950
+ previousPendingFrame.remove();
928
951
  }
929
952
  if (!wasFirstLoad) {
930
953
  pendingMessages = [];
@@ -1021,9 +1044,7 @@
1021
1044
  if (newFrame && newFrame.contentDocument && newFrame.contentDocument === contentDocument) {
1022
1045
  const wasFocused = document.hasFocus();
1023
1046
  const oldActiveFrame = getActiveFrame();
1024
- if (oldActiveFrame) {
1025
- document.body.removeChild(oldActiveFrame);
1026
- }
1047
+ oldActiveFrame?.remove();
1027
1048
  // Styles may have changed since we created the element. Make sure we re-style
1028
1049
  if (initialStyleVersion !== styleVersion) {
1029
1050
  applyStyles(newFrame.contentDocument, newFrame.contentDocument.body);
package/assets/index.html CHANGED
@@ -49,7 +49,8 @@
49
49
  const interval = 250;
50
50
  let isFocused = document.hasFocus();
51
51
  setInterval(() => {
52
- const isCurrentlyFocused = document.hasFocus();
52
+ const target = getActiveFrame();
53
+ const isCurrentlyFocused = document.hasFocus() || !!(target && target.contentDocument && target.contentDocument.body.classList.contains('vscode-context-menu-visible'));
53
54
  if (isCurrentlyFocused === isFocused) {
54
55
  return;
55
56
  }
@@ -111,6 +112,10 @@
111
112
  color: var(--vscode-textLink-foreground);
112
113
  }
113
114
 
115
+ p > a {
116
+ text-decoration: var(--text-link-decoration);
117
+ }
118
+
114
119
  a:hover {
115
120
  color: var(--vscode-textLink-activeForeground);
116
121
  }
@@ -131,6 +136,10 @@
131
136
  border-radius: 4px;
132
137
  }
133
138
 
139
+ pre code {
140
+ padding: 0;
141
+ }
142
+
134
143
  blockquote {
135
144
  background: var(--vscode-textBlockQuote-background);
136
145
  border-color: var(--vscode-textBlockQuote-border);
@@ -571,7 +580,7 @@
571
580
  } else {
572
581
  return; // let the browser handle this
573
582
  }
574
- } else if (!onElectron && (isCloseTab(e) || isNewWindow(e))) {
583
+ } else if (!onElectron && (isCloseTab(e) || isNewWindow(e) || isHelp(e) || isRefresh(e))) {
575
584
  // Prevent Ctrl+W closing window / Ctrl+N opening new window in PWA.
576
585
  // (No effect in a regular browser tab.)
577
586
  e.preventDefault();
@@ -676,6 +685,24 @@
676
685
  return hasMeta && e.keyCode === 78;
677
686
  }
678
687
 
688
+ /**
689
+ * @param {KeyboardEvent} e
690
+ * @return {boolean}
691
+ */
692
+ function isHelp(e) {
693
+ // 112: keyCode of "F1"
694
+ return e.keyCode === 112;
695
+ }
696
+
697
+ /**
698
+ * @param {KeyboardEvent} e
699
+ * @return {boolean}
700
+ */
701
+ function isRefresh(e) {
702
+ // 116: keyCode of "F5"
703
+ return e.keyCode === 116;
704
+ }
705
+
679
706
  let isHandlingScroll = false;
680
707
 
681
708
  /**
@@ -742,6 +769,17 @@
742
769
  }
743
770
  }
744
771
 
772
+
773
+ function handleInnerDragEvent(/** @type {DragEvent} */ e) {
774
+ if (!e.dataTransfer) {
775
+ return;
776
+ }
777
+
778
+ hostMessaging.postMessage('drag', {
779
+ shiftKey: e.shiftKey
780
+ });
781
+ }
782
+
745
783
  /**
746
784
  * @param {() => void} callback
747
785
  */
@@ -832,7 +870,8 @@
832
870
  window.addEventListener('keydown', handleInnerKeydown);
833
871
  window.addEventListener('keyup', handleInnerKeyup);
834
872
  window.addEventListener('dragenter', handleInnerDragStartEvent);
835
- window.addEventListener('dragover', handleInnerDragStartEvent);
873
+ window.addEventListener('dragover', handleInnerDragEvent);
874
+ window.addEventListener('drag', handleInnerDragEvent);
836
875
 
837
876
  onDomReady(() => {
838
877
  if (!document.body) {
@@ -925,7 +964,7 @@
925
964
  const previousPendingFrame = getPendingFrame();
926
965
  if (previousPendingFrame) {
927
966
  previousPendingFrame.setAttribute('id', '');
928
- document.body.removeChild(previousPendingFrame);
967
+ previousPendingFrame.remove();
929
968
  }
930
969
  if (!wasFirstLoad) {
931
970
  pendingMessages = [];
@@ -1022,9 +1061,7 @@
1022
1061
  if (newFrame && newFrame.contentDocument && newFrame.contentDocument === contentDocument) {
1023
1062
  const wasFocused = document.hasFocus();
1024
1063
  const oldActiveFrame = getActiveFrame();
1025
- if (oldActiveFrame) {
1026
- document.body.removeChild(oldActiveFrame);
1027
- }
1064
+ oldActiveFrame?.remove();
1028
1065
  // Styles may have changed since we created the element. Make sure we re-style
1029
1066
  if (initialStyleVersion !== styleVersion) {
1030
1067
  applyStyles(newFrame.contentDocument, newFrame.contentDocument.body);
@@ -1116,7 +1153,8 @@
1116
1153
  });
1117
1154
 
1118
1155
  contentWindow.addEventListener('dragenter', handleInnerDragStartEvent);
1119
- contentWindow.addEventListener('dragover', handleInnerDragStartEvent);
1156
+ contentWindow.addEventListener('dragover', handleInnerDragEvent);
1157
+ contentWindow.addEventListener('drag', handleInnerDragEvent);
1120
1158
 
1121
1159
  unloadMonitor.onIframeLoaded(newFrame);
1122
1160
  }
package/assets/service-worker.js CHANGED
@@ -4,7 +4,6 @@
4
4
  *--------------------------------------------------------------------------------------------*/
5
5
  // @ts-check
6
6
 
7
- /// <reference no-default-lib="true"/>
8
7
  /// <reference lib="webworker" />
9
8
 
10
9
  const sw = /** @type {ServiceWorkerGlobalScope} */ (/** @type {any} */ (self));
@@ -168,7 +167,7 @@ sw.addEventListener('message', async (event) => {
168
167
 
169
168
  sw.addEventListener('fetch', (event) => {
170
169
  const requestUrl = new URL(event.request.url);
171
- if (requestUrl.protocol === 'https:' && requestUrl.hostname.endsWith('.' + resourceBaseAuthority)) {
170
+ if (typeof resourceBaseAuthority === 'string' && requestUrl.protocol === 'https:' && requestUrl.hostname.endsWith('.' + resourceBaseAuthority)) {
172
171
  switch (event.request.method) {
173
172
  case 'GET':
174
173
  case 'HEAD': {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-view-common-service-override",
3
- "version": "6.0.2",
3
+ "version": "7.0.0",
4
4
  "keywords": [],
5
5
  "author": {
6
6
  "name": "CodinGame",
@@ -26,7 +26,7 @@
26
26
  }
27
27
  },
28
28
  "dependencies": {
29
- "vscode": "npm:@codingame/monaco-vscode-api@6.0.2",
30
- "@codingame/monaco-vscode-bulk-edit-service-override": "6.0.2"
29
+ "vscode": "npm:@codingame/monaco-vscode-api@7.0.0",
30
+ "@codingame/monaco-vscode-bulk-edit-service-override": "7.0.0"
31
31
  }
32
32
  }
package/vscode/src/vs/base/browser/ui/centered/centeredViewLayout.js CHANGED
@@ -123,7 +123,7 @@ class CenteredViewLayout {
123
123
  return;
124
124
  }
125
125
  if (active) {
126
- this.container.removeChild(this.view.element);
126
+ this.view.element.remove();
127
127
  this.splitView = ( new SplitView(this.container, {
128
128
  inverseAltBehavior: true,
129
129
  orientation: Orientation.HORIZONTAL,
@@ -149,9 +149,7 @@ class CenteredViewLayout {
149
149
  this.resizeSplitViews();
150
150
  }
151
151
  else {
152
- if (this.splitView) {
153
- this.container.removeChild(this.splitView.el);
154
- }
152
+ this.splitView?.el.remove();
155
153
  this.splitViewDisposables.clear();
156
154
  this.splitView?.dispose();
157
155
  this.splitView = undefined;
package/vscode/src/vs/base/browser/ui/grid/gridview.js CHANGED
@@ -603,7 +603,7 @@ class GridView {
603
603
  set root(root) {
604
604
  const oldRoot = this._root;
605
605
  if (oldRoot) {
606
- this.element.removeChild(oldRoot.element);
606
+ oldRoot.element.remove();
607
607
  oldRoot.dispose();
608
608
  }
609
609
  this._root = root;
@@ -1107,7 +1107,7 @@ class GridView {
1107
1107
  dispose() {
1108
1108
  this.onDidSashResetRelay.dispose();
1109
1109
  this.root.dispose();
1110
- this.element.parentElement?.removeChild(this.element);
1110
+ this.element.remove();
1111
1111
  }
1112
1112
  }
1113
1113
 
package/vscode/src/vs/workbench/browser/actions/listCommands.js CHANGED
@@ -599,7 +599,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
599
599
  }
600
600
  const elementWithHover = getCustomHoverForElement(focusedElement);
601
601
  if (elementWithHover) {
602
- accessor.get(IHoverService).triggerUpdatableHover(elementWithHover);
602
+ accessor.get(IHoverService).showManagedHover(elementWithHover);
603
603
  }
604
604
  },
605
605
  });
package/vscode/src/vs/workbench/browser/media/style.css.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
2
2
 
3
- var css = "@keyframes fadeIn{0%{opacity:0}to{opacity:1}}.mac .monaco-workbench-part,.mac.monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,sans-serif}.mac:lang(zh-Hans) .monaco-workbench-part,.mac:lang(zh-Hans).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,PingFang SC,Hiragino Sans GB,sans-serif}.mac:lang(zh-Hant) .monaco-workbench-part,.mac:lang(zh-Hant).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,PingFang TC,sans-serif}.mac:lang(ja) .monaco-workbench-part,.mac:lang(ja).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,Hiragino Kaku Gothic Pro,sans-serif}.mac:lang(ko) .monaco-workbench-part,.mac:lang(ko).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,Nanum Gothic,Apple SD Gothic Neo,AppleGothic,sans-serif}.windows .monaco-workbench-part,.windows.monaco-workbench-part{font-family:Segoe WPC,Segoe UI,sans-serif}.windows:lang(zh-Hans) .monaco-workbench-part,.windows:lang(zh-Hans).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Microsoft YaHei,sans-serif}.windows:lang(zh-Hant) .monaco-workbench-part,.windows:lang(zh-Hant).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Microsoft Jhenghei,sans-serif}.windows:lang(ja) .monaco-workbench-part,.windows:lang(ja).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Yu Gothic UI,Meiryo UI,sans-serif}.windows:lang(ko) .monaco-workbench-part,.windows:lang(ko).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Malgun Gothic,Dotom,sans-serif}.linux .monaco-workbench-part,.linux.monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,sans-serif}.linux:lang(zh-Hans) .monaco-workbench-part,.linux:lang(zh-Hans).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans SC,Source Han Sans CN,Source Han Sans,sans-serif}.linux:lang(zh-Hant) .monaco-workbench-part,.linux:lang(zh-Hant).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans TC,Source Han Sans TW,Source Han Sans,sans-serif}.linux:lang(ja) .monaco-workbench-part,.linux:lang(ja).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans J,Source Han Sans JP,Source Han Sans,sans-serif}.linux:lang(ko) .monaco-workbench-part,.linux:lang(ko).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans K,Source Han Sans JR,Source Han Sans,UnDotum,FBaekmuk Gulim,sans-serif}.mac .monaco-workbench-part,.mac.monaco-workbench-part{--monaco-monospace-font:\"SF Mono\",Monaco,Menlo,Courier,monospace}.windows .monaco-workbench-part,.windows.monaco-workbench-part{--monaco-monospace-font:Consolas,\"Courier New\",monospace}.linux .monaco-workbench-part,.linux.monaco-workbench-part{--monaco-monospace-font:\"Ubuntu Mono\",\"Liberation Mono\",\"DejaVu Sans Mono\",\"Courier New\",monospace}.monaco-workbench-part{color:var(--vscode-foreground);font-size:13px;line-height:1.4em}.monaco-workbench-part.web,.monaco-workbench.web .monaco-workbench-part{touch-action:none}.monaco-workbench.border:not(.fullscreen){border:1px solid var(--window-border-color);box-sizing:border-box}.monaco-workbench.border.mac{border-radius:5px}.monaco-workbench.border.mac.macos-bigsur-or-newer{border-radius:10px}.monaco-workbench-part img{border:0}.monaco-workbench-part label{cursor:pointer}.monaco-workbench-part a{text-decoration:none}.monaco-workbench.hc-black .monaco-workbench-part p>a,.monaco-workbench.hc-black.monaco-workbench-part p>a,.monaco-workbench.hc-light .monaco-workbench-part p>a,.monaco-workbench.hc-light.monaco-workbench-part p>a{text-decoration:underline!important}.monaco-workbench-part a:active{background-color:inherit;color:inherit}.monaco-workbench-part a.plain,.monaco-workbench-part a.plain.hover,.monaco-workbench-part a.plain:hover{color:inherit;text-decoration:none}.monaco-workbench-part input{color:inherit;font-family:inherit;font-size:100%}.monaco-workbench-part table{color:inherit;font-size:inherit}.monaco-workbench-part input::placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part input::-webkit-input-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part input::-moz-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::-webkit-input-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::-moz-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part .pointer{cursor:pointer}.monaco-workbench.mac.monaco-font-aliasing-antialiased .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-antialiased.monaco-workbench-part{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.monaco-workbench.mac.monaco-font-aliasing-none .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-none.monaco-workbench-part{-webkit-font-smoothing:none;-moz-osx-font-smoothing:unset}@media (-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){.monaco-workbench.mac.monaco-font-aliasing-auto .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-auto.monaco-workbench-part{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}}.monaco-workbench-part .context-view{-webkit-app-region:no-drag}.monaco-workbench-part .codicon{color:var(--vscode-icon-foreground)}.monaco-workbench-part .codicon[class*=codicon-]{font-size:16px}.monaco-workbench-part .predefined-file-icon[class*=codicon-]:before{padding-left:3px;padding-right:3px;width:16px}.predefined-file-icon:before{font-family:codicon}.monaco-workbench:not(.file-icons-enabled) .predefined-file-icon[class*=codicon-]:before{content:unset!important}.monaco-workbench.modal-dialog-visible .monaco-progress-container.infinite .progress-bit{display:none}.monaco-workbench-part select{appearance:none;-webkit-appearance:none;-moz-appearance:none;border:1px solid;font-family:inherit}.monaco-workbench-part .select-container{position:relative}.monaco-workbench-part .select-container:after{bottom:0;content:var(--vscode-icon-chevron-down-content);font-family:var(--vscode-icon-chevron-down-font-family);font-size:16px;height:16px;line-height:16px;margin:auto;pointer-events:none;position:absolute;right:6px;top:0;width:16px}.monaco-workbench-part .synthetic-focus,.monaco-workbench-part [tabindex=\"-1\"]:focus,.monaco-workbench-part [tabindex=\"0\"]:focus,.monaco-workbench-part button:focus,.monaco-workbench-part input[type=button]:focus,.monaco-workbench-part input[type=checkbox]:focus,.monaco-workbench-part input[type=search]:focus,.monaco-workbench-part input[type=text]:focus,.monaco-workbench-part select:focus,.monaco-workbench-part textarea:focus{opacity:1;outline-color:var(--vscode-focusBorder);outline-offset:-1px;outline-style:solid;outline-width:1px}.monaco-workbench.hc-black .synthetic-focus input,.monaco-workbench.hc-light .synthetic-focus input{background:transparent}.monaco-workbench-part input[type=checkbox]:focus{outline-offset:2px}.monaco-workbench-part [tabindex=\"-1\"]:active,.monaco-workbench-part [tabindex=\"0\"]:active,.monaco-workbench-part input[type=button]:active,.monaco-workbench-part input[type=checkbox]:active,.monaco-workbench-part select:active{outline:0!important}.monaco-workbench.mac .monaco-workbench-part select:focus,.monaco-workbench.mac.monaco-workbench-part select:focus{border-color:transparent}.monaco-workbench .monaco-list:not(.element-focused):focus:before{content:\"\";height:100%;left:0;outline:1px solid;outline-color:var(--vscode-focusBorder);outline-offset:-1px;outline-style:solid;outline-width:1px;pointer-events:none;position:absolute;top:0;width:100%;z-index:15}.monaco-workbench .monaco-list .monaco-list-row .monaco-highlighted-label .highlight{color:var(--vscode-list-highlightForeground)}.monaco-workbench .monaco-list .monaco-list-row.focused .monaco-highlighted-label .highlight{color:var(--vscode-list-focusHighlightForeground)}.monaco-workbench-part .monaco-inputbox.error input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.error.synthetic-focus,.monaco-workbench-part .monaco-inputbox.info input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.info.synthetic-focus,.monaco-workbench-part .monaco-inputbox.warning input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.warning.synthetic-focus,.monaco-workbench-part .monaco-list:focus,.monaco-workbench-part .synthetic-focus :focus{outline:0!important}.monaco-workbench-part a.monaco-link:hover{text-decoration:underline}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-label:not(.disabled):hover,.monaco-workbench-part .monaco-action-bar:not(.vertical) .monaco-dropdown-with-primary:not(.disabled):hover{background-color:var(--vscode-toolbar-hoverBackground)}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-item.active .action-label:not(.disabled),.monaco-workbench-part .monaco-action-bar:not(.vertical) .monaco-dropdown.active .action-label:not(.disabled){background-color:var(--vscode-toolbar-activeBackground)}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-item .action-label:hover:not(.disabled){outline:1px dashed var(--vscode-toolbar-hoverOutline);outline-offset:-1px}";
3
+ var css = "@keyframes fadeIn{0%{opacity:0}to{opacity:1}}.mac .monaco-workbench-part,.mac.monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,sans-serif}.mac:lang(zh-Hans) .monaco-workbench-part,.mac:lang(zh-Hans).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,PingFang SC,Hiragino Sans GB,sans-serif}.mac:lang(zh-Hant) .monaco-workbench-part,.mac:lang(zh-Hant).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,PingFang TC,sans-serif}.mac:lang(ja) .monaco-workbench-part,.mac:lang(ja).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,Hiragino Kaku Gothic Pro,sans-serif}.mac:lang(ko) .monaco-workbench-part,.mac:lang(ko).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,Nanum Gothic,Apple SD Gothic Neo,AppleGothic,sans-serif}.windows .monaco-workbench-part,.windows.monaco-workbench-part{font-family:Segoe WPC,Segoe UI,sans-serif}.windows:lang(zh-Hans) .monaco-workbench-part,.windows:lang(zh-Hans).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Microsoft YaHei,sans-serif}.windows:lang(zh-Hant) .monaco-workbench-part,.windows:lang(zh-Hant).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Microsoft Jhenghei,sans-serif}.windows:lang(ja) .monaco-workbench-part,.windows:lang(ja).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Yu Gothic UI,Meiryo UI,sans-serif}.windows:lang(ko) .monaco-workbench-part,.windows:lang(ko).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Malgun Gothic,Dotom,sans-serif}.linux .monaco-workbench-part,.linux.monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,sans-serif}.linux:lang(zh-Hans) .monaco-workbench-part,.linux:lang(zh-Hans).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans SC,Source Han Sans CN,Source Han Sans,sans-serif}.linux:lang(zh-Hant) .monaco-workbench-part,.linux:lang(zh-Hant).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans TC,Source Han Sans TW,Source Han Sans,sans-serif}.linux:lang(ja) .monaco-workbench-part,.linux:lang(ja).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans J,Source Han Sans JP,Source Han Sans,sans-serif}.linux:lang(ko) .monaco-workbench-part,.linux:lang(ko).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans K,Source Han Sans JR,Source Han Sans,UnDotum,FBaekmuk Gulim,sans-serif}.mac .monaco-workbench-part,.mac.monaco-workbench-part{--monaco-monospace-font:\"SF Mono\",Monaco,Menlo,Courier,monospace}.windows .monaco-workbench-part,.windows.monaco-workbench-part{--monaco-monospace-font:Consolas,\"Courier New\",monospace}.linux .monaco-workbench-part,.linux.monaco-workbench-part{--monaco-monospace-font:\"Ubuntu Mono\",\"Liberation Mono\",\"DejaVu Sans Mono\",\"Courier New\",monospace}.monaco-workbench-part{color:var(--vscode-foreground);font-size:13px;line-height:1.4em}.monaco-workbench-part.web,.monaco-workbench.web .monaco-workbench-part{touch-action:none}.monaco-workbench.border:not(.fullscreen){border:1px solid var(--window-border-color);box-sizing:border-box}.monaco-workbench.border.mac{border-radius:5px}.monaco-workbench.border.mac.macos-bigsur-or-newer{border-radius:10px}.monaco-workbench-part img{border:0}.monaco-workbench-part label{cursor:pointer}.monaco-workbench-part a{text-decoration:none}.monaco-workbench-part p>a{text-decoration:var(--text-link-decoration)}.monaco-workbench.underline-links .monaco-workbench-part{--text-link-decoration:underline}.monaco-workbench.hc-black .monaco-workbench-part p>a,.monaco-workbench.hc-black.monaco-workbench-part p>a,.monaco-workbench.hc-light .monaco-workbench-part p>a,.monaco-workbench.hc-light.monaco-workbench-part p>a{text-decoration:underline!important}.monaco-workbench-part a:active{background-color:inherit;color:inherit}.monaco-workbench-part a.plain,.monaco-workbench-part a.plain.hover,.monaco-workbench-part a.plain:hover{color:inherit;text-decoration:none}.monaco-workbench-part input{color:inherit;font-family:inherit;font-size:100%}.monaco-workbench-part table{color:inherit;font-size:inherit}.monaco-workbench-part input::placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part input::-webkit-input-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part input::-moz-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::-webkit-input-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::-moz-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part .pointer{cursor:pointer}.monaco-workbench.mac.monaco-font-aliasing-antialiased .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-antialiased.monaco-workbench-part{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.monaco-workbench.mac.monaco-font-aliasing-none .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-none.monaco-workbench-part{-webkit-font-smoothing:none;-moz-osx-font-smoothing:unset}@media (-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){.monaco-workbench.mac.monaco-font-aliasing-auto .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-auto.monaco-workbench-part{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}}.monaco-workbench-part .context-view{-webkit-app-region:no-drag}.monaco-workbench-part .codicon{color:var(--vscode-icon-foreground)}.monaco-workbench-part .codicon[class*=codicon-]{font-size:16px}.monaco-workbench-part .predefined-file-icon[class*=codicon-]:before{padding-left:3px;padding-right:3px;width:16px}.predefined-file-icon:before{font-family:codicon}.monaco-workbench:not(.file-icons-enabled) .predefined-file-icon[class*=codicon-]:before{content:unset!important}.monaco-workbench.modal-dialog-visible .monaco-progress-container.infinite .progress-bit{display:none}.monaco-workbench-part select{appearance:none;-webkit-appearance:none;-moz-appearance:none;border:1px solid;font-family:inherit}.monaco-workbench-part .select-container{position:relative}.monaco-workbench-part .select-container:after{bottom:0;content:var(--vscode-icon-chevron-down-content);font-family:var(--vscode-icon-chevron-down-font-family);font-size:16px;height:16px;line-height:16px;margin:auto;pointer-events:none;position:absolute;right:6px;top:0;width:16px}.monaco-workbench-part .synthetic-focus,.monaco-workbench-part [tabindex=\"-1\"]:focus,.monaco-workbench-part [tabindex=\"0\"]:focus,.monaco-workbench-part button:focus,.monaco-workbench-part input[type=button]:focus,.monaco-workbench-part input[type=checkbox]:focus,.monaco-workbench-part input[type=search]:focus,.monaco-workbench-part input[type=text]:focus,.monaco-workbench-part select:focus,.monaco-workbench-part textarea:focus{opacity:1;outline-color:var(--vscode-focusBorder);outline-offset:-1px;outline-style:solid;outline-width:1px}.monaco-workbench.hc-black .synthetic-focus input,.monaco-workbench.hc-light .synthetic-focus input{background:transparent}.monaco-workbench-part input[type=checkbox]:focus{outline-offset:2px}.monaco-workbench-part [tabindex=\"-1\"]:active,.monaco-workbench-part [tabindex=\"0\"]:active,.monaco-workbench-part input[type=button]:active,.monaco-workbench-part input[type=checkbox]:active,.monaco-workbench-part select:active{outline:0!important}.monaco-workbench.mac .monaco-workbench-part select:focus,.monaco-workbench.mac.monaco-workbench-part select:focus{border-color:transparent}.monaco-workbench .monaco-list:not(.element-focused):focus:before{content:\"\";height:100%;left:0;outline:1px solid;outline-color:var(--vscode-focusBorder);outline-offset:-1px;outline-style:solid;outline-width:1px;pointer-events:none;position:absolute;top:0;width:100%;z-index:15}.monaco-workbench .monaco-list .monaco-list-row .monaco-highlighted-label .highlight{color:var(--vscode-list-highlightForeground)}.monaco-workbench .monaco-list .monaco-list-row.focused .monaco-highlighted-label .highlight{color:var(--vscode-list-focusHighlightForeground)}.monaco-workbench-part .monaco-inputbox.error input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.error.synthetic-focus,.monaco-workbench-part .monaco-inputbox.info input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.info.synthetic-focus,.monaco-workbench-part .monaco-inputbox.warning input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.warning.synthetic-focus,.monaco-workbench-part .monaco-list:focus,.monaco-workbench-part .synthetic-focus :focus{outline:0!important}.monaco-workbench-part a.monaco-link:hover{text-decoration:underline}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-label:not(.disabled):hover,.monaco-workbench-part .monaco-action-bar:not(.vertical) .monaco-dropdown-with-primary:not(.disabled):hover{background-color:var(--vscode-toolbar-hoverBackground)}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-item.active .action-label:not(.disabled),.monaco-workbench-part .monaco-action-bar:not(.vertical) .monaco-dropdown.active .action-label:not(.disabled){background-color:var(--vscode-toolbar-activeBackground)}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-item .action-label:hover:not(.disabled){outline:1px dashed var(--vscode-toolbar-hoverOutline);outline-offset:-1px}";
4
4
  n(css,{});
5
5
 
6
6
  export { css, css as default };
package/vscode/src/vs/workbench/browser/parts/activitybar/media/activityaction.css.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
2
2
 
3
- var css = ".monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item{display:block;position:relative}.monaco-workbench .activitybar>.content .composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .activitybar>.content .composite-bar>.monaco-action-bar .action-item:before{background-color:transparent;content:\"\";display:none;height:2px;position:absolute;transition-delay:.1s;transition-duration:0ms;transition-property:background-color;width:48px}.monaco-workbench .activitybar>.content.dragged-over .composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .activitybar>.content.dragged-over .composite-bar>.monaco-action-bar .action-item:before{display:block}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:before{transition-delay:0s}.monaco-workbench .activitybar>.content.dragged-over-head>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .activitybar>.content.dragged-over-tail>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom+.action-item:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:last-of-type.bottom:after{background-color:var(--insert-border-color)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label{box-sizing:border-box;display:flex;height:48px;margin-right:0;overflow:hidden;position:relative;width:48px;z-index:1}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label:not(.codicon){font-size:15px;line-height:40px;padding:0 0 0 48px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label.codicon{align-items:center;font-size:24px;justify-content:center}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .action-label.codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .action-label.codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .action-label.codicon{color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .action-label.uri-icon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .action-label.uri-icon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .action-label.uri-icon{background-color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-left:2px solid;content:\"\";height:100%;position:absolute;top:0;width:0;z-index:1}.monaco-workbench.hc-black .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench.hc-black .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-color:var(--vscode-activityBar-activeBorder)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before{height:100%;top:0}.monaco-workbench.hc-black .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator.action-item,.monaco-workbench.hc-light .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator{display:none}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.clicked:focus:before{border-left:none!important}.monaco-workbench .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item .active-item-indicator:before{left:0}.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item .active-item-indicator:before{right:0}.monaco-workbench.hc-black .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-black .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-light .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-light .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before{outline:none}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{bottom:0;height:100%;left:0;margin:auto;overflow:hidden;position:absolute;top:0;width:100%}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge{z-index:2}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{z-index:1}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator{pointer-events:none}.monaco-workbench.border .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator{left:-2px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .badge-content{border-radius:20px;font-size:9px;font-weight:600;height:16px;line-height:16px;min-width:8px;padding:0 4px;position:absolute;right:8px;text-align:center;top:24px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge .profile-icon-overlay{background-color:var(--vscode-activityBar-background);position:absolute;right:6px;top:27px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge .profile-icon-overlay .codicon{color:var(--vscode-activityBar-inactiveForeground)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .profile-badge .profile-icon-overlay .codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .profile-badge .profile-icon-overlay .codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .profile-badge .profile-icon-overlay .codicon{color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge .profile-text-overlay{background-color:var(--vscode-profileBadge-background);border:2px solid var(--vscode-activityBar-background);border-radius:7px;color:var(--vscode-profileBadge-foreground);font-size:9px;font-weight:600;line-height:10px;padding:2px 3px;position:absolute;right:6px;top:24px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:active .profile-text-overlay,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .profile-text-overlay,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .profile-text-overlay{color:var(--vscode-activityBar-foreground)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .codicon.badge-content{font-size:12px;font-weight:unset;justify-content:center;padding:0}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .codicon.badge-content:before{text-align:center;vertical-align:baseline}.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .badge,.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{left:auto;right:0}";
3
+ var css = ".monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item{display:block;position:relative}.monaco-workbench .activitybar>.content .composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .activitybar>.content .composite-bar>.monaco-action-bar .action-item:before{background-color:transparent;content:\"\";display:none;height:2px;position:absolute;transition-delay:.1s;transition-duration:0ms;transition-property:background-color;width:48px}.monaco-workbench .activitybar>.content.dragged-over .composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .activitybar>.content.dragged-over .composite-bar>.monaco-action-bar .action-item:before{display:block}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:before{transition-delay:0s}.monaco-workbench .activitybar>.content.dragged-over-head>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .activitybar>.content.dragged-over-tail>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom+.action-item:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:last-of-type.bottom:after{background-color:var(--insert-border-color)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label{box-sizing:border-box;display:flex;height:48px;margin-right:0;overflow:hidden;position:relative;width:48px;z-index:1}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label:not(.codicon){font-size:15px;line-height:40px;padding:0 0 0 48px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label.codicon{align-items:center;font-size:24px;justify-content:center}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .action-label.codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .action-label.codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .action-label.codicon{color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .action-label.uri-icon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .action-label.uri-icon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .action-label.uri-icon{background-color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-left:2px solid;content:\"\";height:100%;position:absolute;top:0;width:0;z-index:1}.monaco-workbench.hc-black .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench.hc-black .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-color:var(--vscode-activityBar-activeBorder)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before{height:100%;top:0}.monaco-workbench.hc-black .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator.action-item,.monaco-workbench.hc-light .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator{display:none}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.clicked:focus .active-item-indicator:before,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.clicked:focus:before{border-left:none!important}.monaco-workbench .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item .active-item-indicator:before{left:0}.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item .active-item-indicator:before{right:0}.monaco-workbench.hc-black .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-black .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-light .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-light .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before{outline:none}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{bottom:0;height:100%;left:0;margin:auto;overflow:hidden;position:absolute;top:0;width:100%}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge{z-index:2}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{z-index:1}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator{pointer-events:none}.monaco-workbench.border .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator{left:-2px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .badge-content{border-radius:20px;font-size:9px;font-weight:600;height:16px;line-height:16px;min-width:8px;padding:0 4px;position:absolute;right:8px;text-align:center;top:24px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge .profile-icon-overlay{background-color:var(--vscode-activityBar-background);position:absolute;right:6px;top:27px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge .profile-icon-overlay .codicon{color:var(--vscode-activityBar-inactiveForeground)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .profile-badge .profile-icon-overlay .codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .profile-badge .profile-icon-overlay .codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .profile-badge .profile-icon-overlay .codicon{color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge .profile-text-overlay{background-color:var(--vscode-profileBadge-background);border:2px solid var(--vscode-activityBar-background);border-radius:7px;color:var(--vscode-profileBadge-foreground);font-size:9px;font-weight:600;line-height:10px;padding:2px 3px;position:absolute;right:6px;top:24px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:active .profile-text-overlay,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .profile-text-overlay,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .profile-text-overlay{color:var(--vscode-activityBar-foreground)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .codicon.badge-content{font-size:12px;font-weight:unset;justify-content:center;padding:0}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .codicon.badge-content:before{text-align:center;vertical-align:baseline}.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .badge,.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{left:auto;right:0}";
4
4
  n(css,{});
5
5
 
6
6
  export { css, css as default };
package/vscode/src/vs/workbench/browser/parts/compositePart.js CHANGED
@@ -247,7 +247,7 @@ class CompositePart extends Part {
247
247
  const titleContainer = append(parent, $('.title-label'));
248
248
  const titleLabel = append(titleContainer, $('h2'));
249
249
  this.titleLabelElement = titleLabel;
250
- const hover = this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), titleLabel, ''));
250
+ const hover = this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), titleLabel, ''));
251
251
  const $this = this;
252
252
  return {
253
253
  updateTitle: (id, title, keybinding) => {
package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js CHANGED
@@ -73,7 +73,7 @@ let DropOverlay = class DropOverlay extends Themable {
73
73
  this.groupView.element.appendChild(container);
74
74
  this.groupView.element.classList.add('dragged-over');
75
75
  this._register(toDisposable(() => {
76
- this.groupView.element.removeChild(container);
76
+ container.remove();
77
77
  this.groupView.element.classList.remove('dragged-over');
78
78
  }));
79
79
  this.overlay = document.createElement('div');
package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js CHANGED
@@ -536,7 +536,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
536
536
  let groupRegisteredContextKeys = this.registeredContextKeys.get(group.id);
537
537
  if (!groupRegisteredContextKeys) {
538
538
  groupRegisteredContextKeys = ( (new Map()));
539
- this.scopedContextKeys.set(group.id, groupRegisteredContextKeys);
539
+ this.registeredContextKeys.set(group.id, groupRegisteredContextKeys);
540
540
  }
541
541
  let scopedRegisteredContextKey = groupRegisteredContextKeys.get(provider.contextKey.key);
542
542
  if (!scopedRegisteredContextKey) {
package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js CHANGED
@@ -103,7 +103,7 @@ let LanguageStatus = class LanguageStatus {
103
103
  this._update();
104
104
  this._storeState();
105
105
  }
106
- }, this._disposables);
106
+ }, undefined, this._disposables);
107
107
  }
108
108
  dispose() {
109
109
  this._disposables.dispose();
package/vscode/src/vs/workbench/contrib/languageStatus/browser/media/languageStatus.css.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
2
2
 
3
- var css = "@keyframes wiggle{0%{transform:rotate(0) scale(1)}15%,45%{transform:rotate(.04turn) scale(1.1)}30%,60%{transform:rotate(-.04turn) scale(1.2)}to{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)}to{background-color:initial}}.monaco-workbench .statusbar DIV#status\\.languageStatus.flash A{animation-duration:.8s;animation-iteration-count:1;animation-name:flash}.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{display:none;flex:1;margin:auto;padding-right:8px}.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;flex-grow:100;justify-content:space-between;vertical-align:middle}.monaco-workbench .hover-language-status>.element>.left>.detail:not(:empty):before{content:\"\\2013\";opacity:.6;padding:0 4px}.monaco-workbench .hover-language-status>.element>.left>.label:empty{display:none}.monaco-workbench .hover-language-status>.element .left{margin:auto 0}.monaco-workbench .hover-language-status>.element .right{display:flex;margin:auto 0}.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}.monaco-workbench .hover-language-status>.element .right .monaco-action-bar:not(:first-child){padding-left:8px}";
3
+ var css = "@keyframes wiggle{0%{transform:rotate(0) scale(1)}15%,45%{transform:rotate(.04turn) scale(1.1)}30%,60%{transform:rotate(-.04turn) scale(1.2)}to{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)}to{background-color:initial}}.monaco-workbench .statusbar DIV#status\\.languageStatus.flash A{animation-duration:.8s;animation-iteration-count:1;animation-name:flash}.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{display:none;flex:1;margin:auto;padding-right:8px}.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;flex-grow:100;justify-content:space-between;vertical-align:middle}.monaco-workbench .hover-language-status>.element>.left>.detail:not(:empty):before{content:\"\\2013\";opacity:.6;padding:0 4px}.monaco-workbench .hover-language-status>.element>.left>.label:empty{display:none}.monaco-workbench .hover-language-status>.element .left{margin:auto 0}.monaco-workbench .hover-language-status>.element .right{display:flex;margin:auto 0}.monaco-workbench .hover-language-status>.element .right:not(:empty){padding-left:16px}.monaco-workbench .hover-language-status>.element .right .monaco-link{margin:auto 0;text-decoration:var(--text-link-decoration);white-space:nowrap}.monaco-workbench .hover-language-status>.element .right .monaco-action-bar:not(:first-child){padding-left:8px}";
4
4
  n(css,{});
5
5
 
6
6
  export { css, css as default };
package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js CHANGED
@@ -12,19 +12,19 @@ import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
12
12
  import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
13
13
 
14
14
  const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/colors";
15
- registerColor('mergeEditor.change.background', { dark: '#9bb95533', light: '#9bb95533', hcDark: '#9bb95533', hcLight: '#9bb95533', }, ( localizeWithPath(_moduleId, 0, 'The background color for changes.')));
15
+ registerColor('mergeEditor.change.background', '#9bb95533', ( localizeWithPath(_moduleId, 0, 'The background color for changes.')));
16
16
  registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localizeWithPath(_moduleId, 1, 'The background color for word changes.')));
17
17
  registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localizeWithPath(_moduleId, 2, 'The background color for changes in base.')));
18
18
  registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localizeWithPath(_moduleId, 3, 'The background color for word changes in base.')));
19
19
  registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localizeWithPath(_moduleId, 4, 'The border color of unhandled unfocused conflicts.')));
20
- registerColor('mergeEditor.conflict.unhandledFocused.border', { dark: '#ffa600', light: '#ffa600', hcDark: '#ffa600', hcLight: '#ffa600', }, ( localizeWithPath(_moduleId, 5, 'The border color of unhandled focused conflicts.')));
21
- registerColor('mergeEditor.conflict.handledUnfocused.border', { dark: '#86868649', light: '#86868649', hcDark: '#86868649', hcLight: '#86868649', }, ( localizeWithPath(_moduleId, 6, 'The border color of handled unfocused conflicts.')));
22
- registerColor('mergeEditor.conflict.handledFocused.border', { dark: '#c1c1c1cc', light: '#c1c1c1cc', hcDark: '#c1c1c1cc', hcLight: '#c1c1c1cc', }, ( localizeWithPath(_moduleId, 7, 'The border color of handled focused conflicts.')));
23
- const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', { dark: '#adaca8ee', light: '#adaca8ee', hcDark: '#adaca8ee', hcLight: '#adaca8ee', }, ( localizeWithPath(_moduleId, 8, 'The foreground color for changes in input 1.')));
24
- const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', { dark: '#fcba03FF', light: '#fcba03FF', hcDark: '#fcba03FF', hcLight: '#fcba03FF', }, ( localizeWithPath(_moduleId, 9, 'The foreground color for changes in input 1.')));
25
- registerColor('mergeEditor.conflictingLines.background', { dark: '#ffea0047', light: '#ffea0047', hcDark: '#ffea0047', hcLight: '#ffea0047', }, ( localizeWithPath(_moduleId, 10, 'The background of the "Conflicting Lines" text.')));
20
+ registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localizeWithPath(_moduleId, 5, 'The border color of unhandled focused conflicts.')));
21
+ registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localizeWithPath(_moduleId, 6, 'The border color of handled unfocused conflicts.')));
22
+ registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localizeWithPath(_moduleId, 7, 'The border color of handled focused conflicts.')));
23
+ const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localizeWithPath(_moduleId, 8, 'The foreground color for changes in input 1.')));
24
+ const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localizeWithPath(_moduleId, 9, 'The foreground color for changes in input 1.')));
25
+ registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localizeWithPath(_moduleId, 10, 'The background of the "Conflicting Lines" text.')));
26
26
  const contentTransparency = 0.4;
27
- registerColor('mergeEditor.conflict.input1.background', { dark: ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), light: ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), hcDark: ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), hcLight: ( (transparent(mergeCurrentHeaderBackground, contentTransparency))) }, ( localizeWithPath(_moduleId, 11, 'The background color of decorations in input 1.')));
28
- registerColor('mergeEditor.conflict.input2.background', { dark: ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), light: ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), hcDark: ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), hcLight: ( (transparent(mergeIncomingHeaderBackground, contentTransparency))) }, ( localizeWithPath(_moduleId, 12, 'The background color of decorations in input 2.')));
27
+ registerColor('mergeEditor.conflict.input1.background', ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), ( localizeWithPath(_moduleId, 11, 'The background color of decorations in input 1.')));
28
+ registerColor('mergeEditor.conflict.input2.background', ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), ( localizeWithPath(_moduleId, 12, 'The background color of decorations in input 2.')));
29
29
 
30
30
  export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };
package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editorGutter.js CHANGED
@@ -14,9 +14,9 @@ class EditorGutter extends Disposable {
14
14
  this._editor = _editor;
15
15
  this._domNode = _domNode;
16
16
  this.itemProvider = itemProvider;
17
- this.scrollTop = observableFromEvent(this._editor.onDidScrollChange, (e) => this._editor.getScrollTop());
17
+ this.scrollTop = observableFromEvent(this, this._editor.onDidScrollChange, (e) => this._editor.getScrollTop());
18
18
  this.isScrollTopZero = ( this.scrollTop.map((scrollTop) => scrollTop === 0));
19
- this.modelAttached = observableFromEvent(this._editor.onDidChangeModel, (e) => this._editor.hasModel());
19
+ this.modelAttached = observableFromEvent(this, this._editor.onDidChangeModel, (e) => this._editor.hasModel());
20
20
  this.editorOnDidChangeViewZones = observableSignalFromEvent('onDidChangeViewZones', this._editor.onDidChangeViewZones);
21
21
  this.editorOnDidContentSizeChange = observableSignalFromEvent('onDidContentSizeChange', this._editor.onDidContentSizeChange);
22
22
  this.domNodeSizeChanged = observableSignal('domNodeSizeChanged');
@@ -86,7 +86,7 @@ class EditorGutter extends Disposable {
86
86
  for (const id of unusedIds) {
87
87
  const view = this.views.get(id);
88
88
  view.gutterItemView.dispose();
89
- this._domNode.removeChild(view.domNode);
89
+ view.domNode.remove();
90
90
  this.views.delete(id);
91
91
  }
92
92
  }
package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.js CHANGED
@@ -62,9 +62,9 @@ class CodeEditorView extends Disposable {
62
62
  this.editor = this.instantiationService.createInstance(CodeEditorWidget, this.htmlElements.editor, {}, {
63
63
  contributions: this.getEditorContributions(),
64
64
  });
65
- this.isFocused = observableFromEvent(Event.any(this.editor.onDidBlurEditorWidget, this.editor.onDidFocusEditorWidget), () => this.editor.hasWidgetFocus());
66
- this.cursorPosition = observableFromEvent(this.editor.onDidChangeCursorPosition, () => this.editor.getPosition());
67
- this.selection = observableFromEvent(this.editor.onDidChangeCursorSelection, () => this.editor.getSelections());
65
+ this.isFocused = observableFromEvent(this, Event.any(this.editor.onDidBlurEditorWidget, this.editor.onDidFocusEditorWidget), () => this.editor.hasWidgetFocus());
66
+ this.cursorPosition = observableFromEvent(this, this.editor.onDidChangeCursorPosition, () => this.editor.getPosition());
67
+ this.selection = observableFromEvent(this, this.editor.onDidChangeCursorSelection, () => this.editor.getSelections());
68
68
  this.cursorLineNumber = ( this.cursorPosition.map(p => p?.lineNumber));
69
69
  }
70
70
  getEditorContributions() {
package/vscode/src/vs/workbench/contrib/webview/browser/themeing.js CHANGED
@@ -29,7 +29,7 @@ let WebviewThemeDataProvider = class WebviewThemeDataProvider extends Disposable
29
29
  this._register(this._themeService.onDidColorThemeChange(() => {
30
30
  this._reset();
31
31
  }));
32
- const webviewConfigurationKeys = ['editor.fontFamily', 'editor.fontWeight', 'editor.fontSize'];
32
+ const webviewConfigurationKeys = ['editor.fontFamily', 'editor.fontWeight', 'editor.fontSize', 'accessibility.underlineLinks'];
33
33
  this._register(this._configurationService.onDidChangeConfiguration(e => {
34
34
  if (( webviewConfigurationKeys.some(key => e.affectsConfiguration(key)))) {
35
35
  this._reset();
@@ -45,6 +45,7 @@ let WebviewThemeDataProvider = class WebviewThemeDataProvider extends Disposable
45
45
  const editorFontFamily = configuration.fontFamily || EDITOR_FONT_DEFAULTS.fontFamily;
46
46
  const editorFontWeight = configuration.fontWeight || EDITOR_FONT_DEFAULTS.fontWeight;
47
47
  const editorFontSize = configuration.fontSize || EDITOR_FONT_DEFAULTS.fontSize;
48
+ const linkUnderlines = this._configurationService.getValue('accessibility.underlineLinks');
48
49
  const theme = this._themeService.getColorTheme();
49
50
  const exportedColors = getColorRegistry().getColors().reduce((colors, entry) => {
50
51
  const color = theme.getColor(entry.id);
@@ -60,6 +61,7 @@ let WebviewThemeDataProvider = class WebviewThemeDataProvider extends Disposable
60
61
  'vscode-editor-font-family': editorFontFamily,
61
62
  'vscode-editor-font-weight': editorFontWeight,
62
63
  'vscode-editor-font-size': editorFontSize + 'px',
64
+ 'text-link-decoration': linkUnderlines ? 'underline' : 'none',
63
65
  ...exportedColors
64
66
  };
65
67
  const activeTheme = ApiThemeClassName.fromTheme(theme);
package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js CHANGED
@@ -228,6 +228,9 @@ let WebviewElement = class WebviewElement extends Disposable {
228
228
  this._register(this.on('drag-start', () => {
229
229
  this._startBlockingIframeDragEvents();
230
230
  }));
231
+ this._register(this.on('drag', (event) => {
232
+ this.handleDragEvent('drag', event);
233
+ }));
231
234
  if (initInfo.options.enableFindWidget) {
232
235
  this._webviewFindWidget = this._register(instantiationService.createInstance(WebviewFindWidget, this));
233
236
  }
@@ -497,6 +500,13 @@ let WebviewElement = class WebviewElement extends Disposable {
497
500
  });
498
501
  this.window?.dispatchEvent(emulatedKeyboardEvent);
499
502
  }
503
+ handleDragEvent(type, event) {
504
+ const emulatedDragEvent = ( (new DragEvent(type, event)));
505
+ Object.defineProperty(emulatedDragEvent, 'target', {
506
+ get: () => this.element,
507
+ });
508
+ this.window?.dispatchEvent(emulatedDragEvent);
509
+ }
500
510
  windowDidDragStart() {
501
511
  this._startBlockingIframeDragEvents();
502
512
  }
package/vscode/src/vs/workbench/services/progress/browser/progressService.js CHANGED
@@ -26,11 +26,12 @@ import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/p
26
26
  import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
27
27
  import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultDialogStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
28
28
  import { ResultKind } from 'vscode/vscode/vs/platform/keybinding/common/keybindingResolver';
29
+ import { IUserActivityService } from 'vscode/vscode/vs/workbench/services/userActivity/common/userActivityService.service';
29
30
  import Severity$1 from 'vscode/vscode/vs/base/common/severity';
30
31
 
31
32
  const _moduleId = "vs/workbench/services/progress/browser/progressService";
32
33
  let ProgressService = class ProgressService extends Disposable {
33
- constructor(activityService, paneCompositeService, viewDescriptorService, viewsService, notificationService, statusbarService, layoutService, keybindingService) {
34
+ constructor(activityService, paneCompositeService, viewDescriptorService, viewsService, notificationService, statusbarService, layoutService, keybindingService, userActivityService) {
34
35
  super();
35
36
  this.activityService = activityService;
36
37
  this.paneCompositeService = paneCompositeService;
@@ -40,11 +41,21 @@ let ProgressService = class ProgressService extends Disposable {
40
41
  this.statusbarService = statusbarService;
41
42
  this.layoutService = layoutService;
42
43
  this.keybindingService = keybindingService;
44
+ this.userActivityService = userActivityService;
43
45
  this.windowProgressStack = [];
44
46
  this.windowProgressStatusEntry = undefined;
45
47
  }
46
- async withProgress(options, task, onDidCancel) {
48
+ async withProgress(options, originalTask, onDidCancel) {
47
49
  const { location } = options;
50
+ const task = async (progress) => {
51
+ const activeLock = this.userActivityService.markActive();
52
+ try {
53
+ return await originalTask(progress);
54
+ }
55
+ finally {
56
+ activeLock.dispose();
57
+ }
58
+ };
48
59
  const handleStringLocation = (location) => {
49
60
  const viewContainer = this.viewDescriptorService.getViewContainerById(location);
50
61
  if (viewContainer) {
@@ -485,7 +496,8 @@ ProgressService = ( (__decorate([
485
496
  ( (__param(4, INotificationService))),
486
497
  ( (__param(5, IStatusbarService))),
487
498
  ( (__param(6, ILayoutService))),
488
- ( (__param(7, IKeybindingService)))
499
+ ( (__param(7, IKeybindingService))),
500
+ ( (__param(8, IUserActivityService)))
489
501
  ], ProgressService)));
490
502
 
491
503
  export { ProgressService };