@codingame/monaco-vscode-api 8.0.4 → 9.0.2

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 (696) hide show
  1. package/api.js +9 -10
  2. package/debugProtocol.d.ts +69 -5
  3. package/extensions.d.ts +5 -3
  4. package/extensions.js +1 -1
  5. package/localExtensionHost.js +2 -2
  6. package/missing-services.js +19 -3
  7. package/package.json +9 -8
  8. package/service-override/extensions.d.ts +1 -1
  9. package/service-override/tools/editor.d.ts +4 -4
  10. package/service-override/tools/editor.js +7 -3
  11. package/services.js +2 -2
  12. package/tools.js +1 -1
  13. package/vscode/src/vs/base/browser/browser.js +4 -3
  14. package/vscode/src/vs/base/browser/defaultWorkerFactory.js +83 -13
  15. package/vscode/src/vs/base/browser/dom.js +6 -12
  16. package/vscode/src/vs/base/browser/markdownRenderer.js +57 -68
  17. package/vscode/src/vs/base/browser/ui/actionbar/actionViewItems.js +1 -1
  18. package/vscode/src/vs/base/browser/ui/actionbar/actionbar.d.ts +1 -1
  19. package/vscode/src/vs/base/browser/ui/actionbar/actionbar.js +3 -3
  20. package/vscode/src/vs/base/browser/ui/button/button.js +26 -1
  21. package/vscode/src/vs/base/browser/ui/dialog/dialog.css.js +1 -1
  22. package/vscode/src/vs/base/browser/ui/dialog/dialog.js +7 -7
  23. package/vscode/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.js +1 -1
  24. package/vscode/src/vs/base/browser/ui/findinput/findInput.js +1 -1
  25. package/vscode/src/vs/base/browser/ui/findinput/findInputToggles.js +3 -3
  26. package/vscode/src/vs/base/browser/ui/findinput/replaceInput.js +2 -2
  27. package/vscode/src/vs/base/browser/ui/hover/hover.d.ts +1 -0
  28. package/vscode/src/vs/base/browser/ui/hover/hoverDelegate.d.ts +7 -0
  29. package/vscode/src/vs/base/browser/ui/hover/hoverWidget.js +2 -2
  30. package/vscode/src/vs/base/browser/ui/iconLabel/iconLabel.js +8 -6
  31. package/vscode/src/vs/base/browser/ui/icons/iconSelectBox.js +2 -2
  32. package/vscode/src/vs/base/browser/ui/inputbox/inputBox.js +6 -6
  33. package/vscode/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.js +1 -1
  34. package/vscode/src/vs/base/browser/ui/list/listView.js +2 -2
  35. package/vscode/src/vs/base/browser/ui/menu/menubar.js +1 -1
  36. package/vscode/src/vs/base/browser/ui/selectBox/selectBoxCustom.js +1 -1
  37. package/vscode/src/vs/base/browser/ui/splitview/paneview.js +1 -1
  38. package/vscode/src/vs/base/browser/ui/table/tableWidget.js +8 -0
  39. package/vscode/src/vs/base/browser/ui/toolbar/toolbar.js +1 -1
  40. package/vscode/src/vs/base/browser/ui/tree/abstractTree.js +11 -6
  41. package/vscode/src/vs/base/browser/ui/tree/treeDefaults.js +1 -1
  42. package/vscode/src/vs/base/common/actions.js +1 -1
  43. package/vscode/src/vs/base/common/amd.js +119 -0
  44. package/vscode/src/vs/base/common/async.d.ts +13 -1
  45. package/vscode/src/vs/base/common/date.js +22 -6
  46. package/vscode/src/vs/base/common/event.d.ts +6 -0
  47. package/vscode/src/vs/base/common/event.js +5 -0
  48. package/vscode/src/vs/base/common/jsonErrorMessages.js +9 -9
  49. package/vscode/src/vs/base/common/keybindingLabels.js +20 -20
  50. package/vscode/src/vs/base/common/network.js +15 -13
  51. package/vscode/src/vs/base/common/performance.js +1 -1
  52. package/vscode/src/vs/base/common/platform.js +3 -1
  53. package/vscode/src/vs/base/common/product.d.ts +0 -1
  54. package/vscode/src/vs/base/common/worker/simpleWorker.js +136 -127
  55. package/vscode/src/vs/editor/browser/controller/mouseHandler.js +18 -66
  56. package/vscode/src/vs/editor/browser/controller/mouseTarget.js +5 -18
  57. package/vscode/src/vs/editor/browser/controller/pointerHandler.js +3 -3
  58. package/vscode/src/vs/editor/browser/controller/textAreaHandler.js +5 -5
  59. package/vscode/src/vs/editor/browser/coreCommands.js +3 -3
  60. package/vscode/src/vs/editor/browser/services/editorWorkerService.js +115 -221
  61. package/vscode/src/vs/editor/browser/services/hoverService/hoverWidget.js +2 -2
  62. package/vscode/src/vs/editor/browser/services/hoverService/updatableHoverWidget.js +5 -2
  63. package/vscode/src/vs/editor/browser/view/viewLayer.js +20 -20
  64. package/vscode/src/vs/editor/browser/view/viewOverlays.js +5 -6
  65. package/vscode/src/vs/editor/browser/view.js +1 -3
  66. package/vscode/src/vs/editor/browser/viewParts/lines/viewLines.js +10 -14
  67. package/vscode/src/vs/editor/browser/viewParts/minimap/minimap.js +3 -1
  68. package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js +4 -3
  69. package/vscode/src/vs/editor/browser/widget/diffEditor/commands.js +12 -12
  70. package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js +14 -14
  71. package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js +1 -1
  72. package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js +3 -1
  73. package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.js +7 -7
  74. package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js +5 -5
  75. package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js +7 -7
  76. package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js +4 -4
  77. package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js +2 -2
  78. package/vscode/src/vs/editor/browser/widget/diffEditor/registrations.contribution.js +5 -5
  79. package/vscode/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.js +3 -3
  80. package/vscode/src/vs/editor/browser/widget/multiDiffEditor/colors.js +4 -4
  81. package/vscode/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.js +15 -5
  82. package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js +1 -1
  83. package/vscode/src/vs/editor/common/config/editorConfigurationSchema.js +59 -50
  84. package/vscode/src/vs/editor/common/config/editorOptions.js +1 -1
  85. package/vscode/src/vs/editor/common/core/editorColorRegistry.js +71 -71
  86. package/vscode/src/vs/editor/common/cursor/cursor.js +1 -1
  87. package/vscode/src/vs/editor/common/cursor/cursorTypeEditOperations.js +1 -1
  88. package/vscode/src/vs/editor/common/editorContextKeys.js +47 -47
  89. package/vscode/src/vs/editor/common/languages/modesRegistry.js +1 -1
  90. package/vscode/src/vs/editor/common/languages.js +29 -28
  91. package/vscode/src/vs/editor/common/model/editStack.js +1 -1
  92. package/vscode/src/vs/editor/common/model/textModel.js +8 -39
  93. package/vscode/src/vs/editor/common/model/tokenizationTextModelPart.js +84 -74
  94. package/vscode/src/vs/editor/common/model/tokens.js +82 -0
  95. package/vscode/src/vs/editor/common/model/treeSitterTokens.js +69 -0
  96. package/vscode/src/vs/editor/common/model.d.ts +2 -0
  97. package/vscode/src/vs/editor/common/services/editorSimpleWorker.js +39 -241
  98. package/vscode/src/vs/editor/common/services/editorWorker.d.ts +3 -2
  99. package/vscode/src/vs/editor/common/services/editorWorkerBootstrap.js +27 -0
  100. package/vscode/src/vs/editor/common/services/editorWorkerHost.js +10 -0
  101. package/vscode/src/vs/editor/common/services/getIconClasses.js +1 -1
  102. package/vscode/src/vs/editor/common/services/languageService.js +10 -37
  103. package/vscode/src/vs/editor/common/services/modelService.js +6 -17
  104. package/vscode/src/vs/editor/common/services/textModelSync/textModelSync.impl.js +323 -0
  105. package/vscode/src/vs/editor/common/services/treeSitterParserService.js +3 -0
  106. package/vscode/src/vs/editor/common/standaloneStrings.js +57 -28
  107. package/vscode/src/vs/editor/common/viewLayout/viewLineRenderer.js +2 -2
  108. package/vscode/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.js +6 -6
  109. package/vscode/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.js +6 -6
  110. package/vscode/src/vs/editor/contrib/caretOperations/browser/caretOperations.js +2 -2
  111. package/vscode/src/vs/editor/contrib/caretOperations/browser/transpose.js +1 -1
  112. package/vscode/src/vs/editor/contrib/clipboard/browser/clipboard.js +17 -17
  113. package/vscode/src/vs/editor/contrib/codeAction/browser/codeAction.js +1 -1
  114. package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionCommands.js +28 -28
  115. package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionContributions.js +3 -3
  116. package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js +14 -6
  117. package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionMenu.js +8 -8
  118. package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionModel.js +14 -1
  119. package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js +41 -29
  120. package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js +2 -2
  121. package/vscode/src/vs/editor/contrib/colorPicker/browser/colorContributions.js +2 -2
  122. package/vscode/src/vs/editor/contrib/colorPicker/browser/colorHoverParticipant.js +1 -1
  123. package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.js +2 -2
  124. package/vscode/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.js +13 -13
  125. package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.js +7 -7
  126. package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.js +10 -30
  127. package/vscode/src/vs/editor/contrib/comment/browser/comment.js +6 -6
  128. package/vscode/src/vs/editor/contrib/contextmenu/browser/contextmenu.js +10 -10
  129. package/vscode/src/vs/editor/contrib/cursorUndo/browser/cursorUndo.js +2 -2
  130. package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.js +3 -3
  131. package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js +12 -15
  132. package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.js +8 -8
  133. package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution.js +1 -1
  134. package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js +3 -3
  135. package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js +2 -2
  136. package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js +1 -1
  137. package/vscode/src/vs/editor/contrib/find/browser/findController.js +26 -25
  138. package/vscode/src/vs/editor/contrib/find/browser/findWidget.js +27 -27
  139. package/vscode/src/vs/editor/contrib/folding/browser/folding.d.ts +4 -1
  140. package/vscode/src/vs/editor/contrib/folding/browser/folding.js +20 -3
  141. package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js +9 -9
  142. package/vscode/src/vs/editor/contrib/folding/browser/foldingModel.d.ts +2 -1
  143. package/vscode/src/vs/editor/contrib/folding/browser/foldingModel.js +5 -13
  144. package/vscode/src/vs/editor/contrib/folding/browser/foldingRanges.d.ts +3 -1
  145. package/vscode/src/vs/editor/contrib/folding/browser/foldingRanges.js +2 -2
  146. package/vscode/src/vs/editor/contrib/fontZoom/browser/fontZoom.js +3 -3
  147. package/vscode/src/vs/editor/contrib/format/browser/formatActions.js +2 -2
  148. package/vscode/src/vs/editor/contrib/gotoError/browser/gotoError.js +8 -8
  149. package/vscode/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js +14 -14
  150. package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.js +39 -39
  151. package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.js +1 -1
  152. package/vscode/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.js +1 -1
  153. package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.js +9 -4
  154. package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.js +3 -3
  155. package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.js +10 -14
  156. package/vscode/src/vs/editor/contrib/gotoSymbol/browser/referencesModel.js +8 -8
  157. package/vscode/src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.js +3 -3
  158. package/vscode/src/vs/editor/contrib/hover/browser/{hoverController.js → contentHoverController2.js} +26 -84
  159. package/vscode/src/vs/editor/contrib/hover/browser/contentHoverRendered.js +3 -3
  160. package/vscode/src/vs/editor/contrib/hover/browser/{contentHoverController.js → contentHoverWidgetWrapper.js} +20 -5
  161. package/vscode/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.js +5 -5
  162. package/vscode/src/vs/editor/contrib/hover/browser/hoverActionIds.js +2 -2
  163. package/vscode/src/vs/editor/contrib/hover/browser/hoverActions.js +37 -37
  164. package/vscode/src/vs/editor/contrib/hover/browser/hoverContribution.js +4 -2
  165. package/vscode/src/vs/editor/contrib/hover/browser/hoverUtils.js +12 -0
  166. package/vscode/src/vs/editor/contrib/hover/browser/marginHoverController.js +166 -0
  167. package/vscode/src/vs/editor/contrib/hover/browser/marginHoverWidget.js +24 -4
  168. package/vscode/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.js +9 -9
  169. package/vscode/src/vs/editor/contrib/hover/browser/markerHoverParticipant.js +7 -6
  170. package/vscode/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.js +2 -2
  171. package/vscode/src/vs/editor/contrib/indentation/browser/indentation.js +20 -20
  172. package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js +8 -8
  173. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{commands.js → controller/commands.js} +26 -26
  174. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionContextKeys.js → controller/inlineCompletionContextKeys.js} +14 -14
  175. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsController.js → controller/inlineCompletionsController.js} +35 -35
  176. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{hoverParticipant.js → hintsWidget/hoverParticipant.js} +23 -23
  177. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsHintsWidget.css.js → hintsWidget/inlineCompletionsHintsWidget.css.js} +1 -1
  178. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsHintsWidget.js → hintsWidget/inlineCompletionsHintsWidget.js} +38 -38
  179. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.js +3 -3
  180. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.js +2 -2
  181. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{ghostText.js → model/ghostText.js} +5 -5
  182. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsModel.js → model/inlineCompletionsModel.js} +27 -27
  183. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsSource.js → model/inlineCompletionsSource.js} +16 -16
  184. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{provideInlineCompletions.js → model/provideInlineCompletions.js} +11 -11
  185. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{singleTextEdit.js → model/singleTextEdit.js} +6 -6
  186. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{suggestWidgetInlineCompletionProvider.js → model/suggestWidgetAdaptor.js} +11 -11
  187. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{ghostText.css.js → view/ghostTextView.css.js} +1 -1
  188. package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{ghostTextWidget.js → view/ghostTextView.js} +29 -29
  189. package/vscode/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.js +1 -1
  190. package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.js +1 -1
  191. package/vscode/src/vs/editor/contrib/inlineEdits/browser/commands.js +6 -6
  192. package/vscode/src/vs/editor/contrib/inlineEdits/browser/consts.js +2 -2
  193. package/vscode/src/vs/editor/contrib/inlineEdits/browser/inlineEditsModel.js +1 -1
  194. package/vscode/src/vs/editor/contrib/lineSelection/browser/lineSelection.js +1 -1
  195. package/vscode/src/vs/editor/contrib/linesOperations/browser/linesOperations.js +30 -30
  196. package/vscode/src/vs/editor/contrib/linkedEditing/browser/linkedEditing.js +2 -2
  197. package/vscode/src/vs/editor/contrib/links/browser/links.js +10 -10
  198. package/vscode/src/vs/editor/contrib/message/browser/messageController.js +1 -1
  199. package/vscode/src/vs/editor/contrib/multicursor/browser/multicursor.js +22 -22
  200. package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHints.js +1 -1
  201. package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.js +4 -4
  202. package/vscode/src/vs/editor/contrib/peekView/browser/peekView.js +17 -17
  203. package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.js +1 -1
  204. package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js +5 -5
  205. package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +32 -32
  206. package/vscode/src/vs/editor/contrib/readOnlyMessage/browser/contribution.js +2 -2
  207. package/vscode/src/vs/editor/contrib/rename/browser/rename.js +11 -11
  208. package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js +6 -8
  209. package/vscode/src/vs/editor/contrib/smartSelect/browser/smartSelect.js +4 -4
  210. package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.js +4 -4
  211. package/vscode/src/vs/editor/contrib/snippet/browser/snippetVariables.js +4 -4
  212. package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js +11 -11
  213. package/vscode/src/vs/editor/contrib/suggest/browser/suggest.js +8 -8
  214. package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.js +28 -13
  215. package/vscode/src/vs/editor/contrib/suggest/browser/suggestModel.js +6 -3
  216. package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidget.js +16 -16
  217. package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js +2 -2
  218. package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.js +2 -2
  219. package/vscode/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.js +33 -33
  220. package/vscode/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js +4 -4
  221. package/vscode/src/vs/editor/contrib/tokenization/browser/tokenization.js +1 -1
  222. package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.js +24 -24
  223. package/vscode/src/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.js +5 -5
  224. package/vscode/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.js +9 -9
  225. package/vscode/src/vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider.js +64 -0
  226. package/vscode/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.js +62 -89
  227. package/vscode/src/vs/editor/contrib/wordOperations/browser/wordOperations.js +1 -1
  228. package/vscode/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.js +3 -3
  229. package/vscode/src/vs/editor/standalone/browser/standaloneCodeEditor.js +0 -1
  230. package/vscode/src/vs/editor/standalone/browser/standaloneServices.d.ts +1 -1
  231. package/vscode/src/vs/editor/standalone/browser/standaloneServices.js +24 -3
  232. package/vscode/src/vs/editor/standalone/browser/standaloneTreeSitterService.js +13 -0
  233. package/vscode/src/vs/nls.js +4 -3
  234. package/vscode/src/vs/nls.messages.js +7 -0
  235. package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js +49 -49
  236. package/vscode/src/vs/platform/action/common/actionCommonCategories.js +6 -6
  237. package/vscode/src/vs/platform/actionWidget/browser/actionList.js +4 -4
  238. package/vscode/src/vs/platform/actionWidget/browser/actionWidget.css.js +1 -1
  239. package/vscode/src/vs/platform/actionWidget/browser/actionWidget.js +7 -7
  240. package/vscode/src/vs/platform/actions/browser/buttonbar.js +8 -7
  241. package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.js +5 -5
  242. package/vscode/src/vs/platform/actions/browser/toolbar.js +2 -2
  243. package/vscode/src/vs/platform/actions/common/actions.d.ts +2 -0
  244. package/vscode/src/vs/platform/actions/common/actions.js +2 -0
  245. package/vscode/src/vs/platform/actions/common/menuResetAction.js +1 -1
  246. package/vscode/src/vs/platform/actions/common/menuService.js +17 -7
  247. package/vscode/src/vs/platform/clipboard/browser/clipboardService.js +45 -5
  248. package/vscode/src/vs/platform/clipboard/common/clipboardService.service.d.ts +6 -0
  249. package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js +1 -1
  250. package/vscode/src/vs/platform/contextkey/common/contextkeys.js +9 -9
  251. package/vscode/src/vs/platform/contextkey/common/scanner.js +5 -5
  252. package/vscode/src/vs/platform/dialogs/common/dialogs.js +9 -9
  253. package/vscode/src/vs/platform/dnd/browser/dnd.js +1 -1
  254. package/vscode/src/vs/platform/extensionManagement/common/extensionEnablementService.js +4 -4
  255. package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +3 -2
  256. package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +1 -1
  257. package/vscode/src/vs/platform/extensionManagement/common/extensionStorage.js +1 -1
  258. package/vscode/src/vs/platform/extensions/common/extensionValidator.js +19 -19
  259. package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.js +16 -10
  260. package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js +2 -2
  261. package/vscode/src/vs/platform/history/browser/contextScopedHistoryWidget.js +1 -1
  262. package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js +4 -4
  263. package/vscode/src/vs/platform/languagePacks/common/languagePacks.js +1 -1
  264. package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js +3 -3
  265. package/vscode/src/vs/platform/list/browser/listService.js +27 -27
  266. package/vscode/src/vs/platform/markers/common/markerService.js +0 -1
  267. package/vscode/src/vs/platform/markers/common/markers.js +3 -3
  268. package/vscode/src/vs/platform/quickinput/browser/quickAccess.js +1 -1
  269. package/vscode/src/vs/platform/quickinput/browser/quickInput.js +8 -8
  270. package/vscode/src/vs/platform/quickinput/browser/quickInputActions.js +3 -3
  271. package/vscode/src/vs/platform/quickinput/browser/quickInputController.js +11 -8
  272. package/vscode/src/vs/platform/quickinput/browser/quickInputService.js +3 -3
  273. package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js +43 -35
  274. package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js +1 -1
  275. package/vscode/src/vs/platform/quickinput/browser/quickPickPin.js +10 -7
  276. package/vscode/src/vs/platform/quickinput/common/quickInput.d.ts +12 -2
  277. package/vscode/src/vs/platform/quickinput/common/quickInput.service.d.ts +10 -1
  278. package/vscode/src/vs/platform/request/common/request.js +14 -14
  279. package/vscode/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.d.ts +19 -4
  280. package/vscode/src/vs/platform/terminal/common/terminal.d.ts +11 -8
  281. package/vscode/src/vs/platform/terminal/common/terminal.js +9 -5
  282. package/vscode/src/vs/platform/theme/common/colorUtils.js +4 -3
  283. package/vscode/src/vs/platform/theme/common/colors/baseColors.js +17 -17
  284. package/vscode/src/vs/platform/theme/common/colors/chartsColors.js +8 -8
  285. package/vscode/src/vs/platform/theme/common/colors/editorColors.js +94 -94
  286. package/vscode/src/vs/platform/theme/common/colors/inputColors.js +45 -45
  287. package/vscode/src/vs/platform/theme/common/colors/listColors.js +37 -33
  288. package/vscode/src/vs/platform/theme/common/colors/menuColors.js +7 -7
  289. package/vscode/src/vs/platform/theme/common/colors/minimapColors.js +11 -11
  290. package/vscode/src/vs/platform/theme/common/colors/miscColors.js +8 -8
  291. package/vscode/src/vs/platform/theme/common/colors/quickpickColors.js +9 -9
  292. package/vscode/src/vs/platform/theme/common/colors/searchColors.js +3 -3
  293. package/vscode/src/vs/platform/theme/common/iconRegistry.js +5 -5
  294. package/vscode/src/vs/platform/theme/common/tokenClassificationRegistry.js +42 -42
  295. package/vscode/src/vs/platform/undoRedo/common/undoRedoService.js +20 -20
  296. package/vscode/src/vs/platform/userDataSync/common/abstractSynchronizer.js +2 -2
  297. package/vscode/src/vs/platform/userDataSync/common/userDataSync.js +5 -5
  298. package/vscode/src/vs/platform/userDataSync/common/userDataSyncMachines.js +1 -1
  299. package/vscode/src/vs/platform/window/common/window.js +16 -1
  300. package/vscode/src/vs/workbench/api/common/extHost.api.impl.js +20 -73
  301. package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js +98 -52
  302. package/vscode/src/vs/workbench/api/common/extHostComments.js +1 -1
  303. package/vscode/src/vs/workbench/api/common/extHostDiagnostics.js +1 -1
  304. package/vscode/src/vs/workbench/api/common/extHostExtensionService.js +2 -2
  305. package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +5 -5
  306. package/vscode/src/vs/workbench/api/common/extHostLanguageModelTools.js +55 -13
  307. package/vscode/src/vs/workbench/api/common/extHostLanguageModels.js +5 -5
  308. package/vscode/src/vs/workbench/api/common/extHostNotebook.js +11 -11
  309. package/vscode/src/vs/workbench/api/common/extHostSearch.js +48 -5
  310. package/vscode/src/vs/workbench/api/common/extHostStatusBar.js +2 -2
  311. package/vscode/src/vs/workbench/api/common/extHostTask.js +2 -1
  312. package/vscode/src/vs/workbench/api/common/extHostTesting.js +22 -9
  313. package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +1 -1
  314. package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +147 -48
  315. package/vscode/src/vs/workbench/api/common/extHostTypes.js +17 -10
  316. package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +230 -80
  317. package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +12 -12
  318. package/vscode/src/vs/workbench/api/worker/extensionHostWorker.esm.js +3 -0
  319. package/vscode/src/vs/workbench/browser/actions/developerActions.js +31 -31
  320. package/vscode/src/vs/workbench/browser/actions/layoutActions.js +154 -148
  321. package/vscode/src/vs/workbench/browser/actions/textInputActions.js +6 -6
  322. package/vscode/src/vs/workbench/browser/actions/windowActions.js +25 -25
  323. package/vscode/src/vs/workbench/browser/actions/workspaceActions.js +21 -21
  324. package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js +4 -4
  325. package/vscode/src/vs/workbench/browser/editor.js +2 -2
  326. package/vscode/src/vs/workbench/browser/labels.js +2 -2
  327. package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +11 -11
  328. package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js +11 -11
  329. package/vscode/src/vs/workbench/browser/parts/editor/binaryDiffEditor.js +1 -1
  330. package/vscode/src/vs/workbench/browser/parts/editor/binaryEditor.js +3 -3
  331. package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.js +41 -41
  332. package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsControl.js +11 -11
  333. package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.js +1 -1
  334. package/vscode/src/vs/workbench/browser/parts/editor/diffEditorCommands.js +6 -6
  335. package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js +131 -131
  336. package/vscode/src/vs/workbench/browser/parts/editor/editorAutoSave.js +2 -2
  337. package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js +16 -16
  338. package/vscode/src/vs/workbench/browser/parts/editor/editorGroupView.js +7 -7
  339. package/vscode/src/vs/workbench/browser/parts/editor/editorGroupWatermark.js +13 -13
  340. package/vscode/src/vs/workbench/browser/parts/editor/editorPanes.js +2 -2
  341. package/vscode/src/vs/workbench/browser/parts/editor/editorPlaceholder.js +9 -9
  342. package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js +5 -5
  343. package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js +74 -72
  344. package/vscode/src/vs/workbench/browser/parts/editor/editorTabsControl.js +2 -2
  345. package/vscode/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.js +1 -1
  346. package/vscode/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.js +19 -9
  347. package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js +1 -1
  348. package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js +1 -1
  349. package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +3 -3
  350. package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js +1 -1
  351. package/vscode/src/vs/workbench/browser/parts/globalCompositeBar.js +15 -15
  352. package/vscode/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css.js +1 -1
  353. package/vscode/src/vs/workbench/browser/parts/notifications/media/notificationsList.css.js +1 -1
  354. package/vscode/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css.js +1 -1
  355. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsActions.js +17 -17
  356. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsAlerts.js +3 -3
  357. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCenter.js +6 -6
  358. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCommands.js +9 -9
  359. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsList.js +6 -6
  360. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsStatus.js +13 -13
  361. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsToasts.js +2 -2
  362. package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js +4 -4
  363. package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +34 -34
  364. package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +18 -18
  365. package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js +2 -2
  366. package/vscode/src/vs/workbench/browser/parts/views/checkbox.js +1 -1
  367. package/vscode/src/vs/workbench/browser/parts/views/treeView.js +7 -7
  368. package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js +1 -1
  369. package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +4 -4
  370. package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js +9 -6
  371. package/vscode/src/vs/workbench/browser/quickaccess.js +1 -1
  372. package/vscode/src/vs/workbench/browser/window.js +24 -17
  373. package/vscode/src/vs/workbench/browser/workbench.contribution.js +217 -217
  374. package/vscode/src/vs/workbench/common/configuration.js +10 -10
  375. package/vscode/src/vs/workbench/common/editor/diffEditorInput.js +1 -1
  376. package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js +1 -1
  377. package/vscode/src/vs/workbench/common/editor/textEditorModel.js +1 -1
  378. package/vscode/src/vs/workbench/common/theme.js +156 -156
  379. package/vscode/src/vs/workbench/common/views.js +5 -5
  380. package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +178 -137
  381. package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +13 -13
  382. package/vscode/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.js +6 -0
  383. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js +88 -61
  384. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.js +4 -4
  385. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js +9 -9
  386. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.js +289 -0
  387. package/vscode/src/vs/workbench/contrib/chat/browser/chat.js +1 -1
  388. package/vscode/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.js +11 -11
  389. package/vscode/src/vs/workbench/contrib/chat/browser/chatAgentHover.js +2 -2
  390. package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.js +8 -8
  391. package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCodeCitationContentPart.js +1 -1
  392. package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCommandContentPart.js +1 -1
  393. package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.js +3 -2
  394. package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.js +15 -9
  395. package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.js +31 -74
  396. package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.service.js +3 -0
  397. package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTreeContentPart.js +1 -1
  398. package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css.js +1 -1
  399. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditorInput.js +2 -2
  400. package/vscode/src/vs/workbench/contrib/chat/browser/chatFollowups.js +5 -12
  401. package/vscode/src/vs/workbench/contrib/chat/browser/chatInputPart.js +73 -60
  402. package/vscode/src/vs/workbench/contrib/chat/browser/chatListRenderer.js +139 -50
  403. package/vscode/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.js +36 -19
  404. package/vscode/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.js +26 -3
  405. package/vscode/src/vs/workbench/contrib/chat/browser/chatWidget.js +39 -31
  406. package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.css.js +1 -1
  407. package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.js +50 -37
  408. package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.js +7 -20
  409. package/vscode/src/vs/workbench/contrib/chat/browser/media/chat.css.js +1 -1
  410. package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.js +62 -1
  411. package/vscode/src/vs/workbench/contrib/chat/common/chatColors.js +6 -6
  412. package/vscode/src/vs/workbench/contrib/chat/common/chatContextKeys.js +36 -17
  413. package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js +105 -40
  414. package/vscode/src/vs/workbench/contrib/chat/common/chatParserTypes.js +35 -2
  415. package/vscode/src/vs/workbench/contrib/chat/common/chatRequestParser.js +12 -5
  416. package/vscode/src/vs/workbench/contrib/chat/common/chatService.js +13 -1
  417. package/vscode/src/vs/workbench/contrib/chat/common/chatViewModel.js +17 -21
  418. package/vscode/src/vs/workbench/contrib/chat/common/chatWordCounter.js +17 -1
  419. package/vscode/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.js +3 -0
  420. package/vscode/src/vs/workbench/contrib/chat/common/languageModels.js +6 -6
  421. package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +15 -15
  422. package/vscode/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.js +10 -10
  423. package/vscode/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.js +6 -6
  424. package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js +4 -4
  425. package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp.js +5 -5
  426. package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js +3 -3
  427. package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js +10 -10
  428. package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js +3 -3
  429. package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js +6 -6
  430. package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js +15 -6
  431. package/vscode/src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.js +33 -1
  432. package/vscode/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js +13 -34
  433. package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js +2 -2
  434. package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js +4 -4
  435. package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js +2 -2
  436. package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js +2 -2
  437. package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js +5 -5
  438. package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js +7 -7
  439. package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js +5 -5
  440. package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js +3 -3
  441. package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js +4 -4
  442. package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +3 -3
  443. package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js +18 -4
  444. package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js +15 -4
  445. package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js +0 -8
  446. package/vscode/src/vs/workbench/contrib/comments/browser/commentsAccessibility.js +10 -10
  447. package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +7 -6
  448. package/vscode/src/vs/workbench/contrib/comments/browser/commentsModel.js +13 -6
  449. package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +17 -13
  450. package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +64 -30
  451. package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js +85 -11
  452. package/vscode/src/vs/workbench/contrib/comments/browser/reactionsAction.js +7 -7
  453. package/vscode/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.js +6 -4
  454. package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js +9 -9
  455. package/vscode/src/vs/workbench/contrib/comments/common/commentModel.js +30 -0
  456. package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInput.js +3 -3
  457. package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +15 -9
  458. package/vscode/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.js +65 -60
  459. package/vscode/src/vs/workbench/contrib/debug/browser/breakpointWidget.js +21 -16
  460. package/vscode/src/vs/workbench/contrib/debug/browser/breakpointsView.js +75 -74
  461. package/vscode/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.js +2 -2
  462. package/vscode/src/vs/workbench/contrib/debug/browser/debugColors.js +12 -12
  463. package/vscode/src/vs/workbench/contrib/debug/browser/debugCommands.js +45 -41
  464. package/vscode/src/vs/workbench/contrib/debug/browser/debugIcons.js +57 -57
  465. package/vscode/src/vs/workbench/contrib/debug/browser/debugSessionPicker.js +4 -4
  466. package/vscode/src/vs/workbench/contrib/debug/browser/linkDetector.js +260 -0
  467. package/vscode/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.js +1 -1
  468. package/vscode/src/vs/workbench/contrib/debug/common/debug.d.ts +9 -1
  469. package/vscode/src/vs/workbench/contrib/debug/common/debugModel.js +18 -11
  470. package/vscode/src/vs/workbench/contrib/debug/common/debugSource.js +1 -1
  471. package/vscode/src/vs/workbench/contrib/debug/common/debugUtils.js +3 -0
  472. package/vscode/src/vs/workbench/contrib/debug/common/disassemblyViewInput.js +2 -2
  473. package/vscode/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.js +2 -2
  474. package/vscode/src/vs/workbench/contrib/debug/common/replModel.js +1 -1
  475. package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.js +166 -166
  476. package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsIcons.js +24 -24
  477. package/vscode/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.js +5 -5
  478. package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js +2 -2
  479. package/vscode/src/vs/workbench/contrib/extensions/common/extensionsUtils.js +3 -3
  480. package/vscode/src/vs/workbench/contrib/externalUriOpener/common/configuration.js +4 -4
  481. package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js +4 -4
  482. package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.js +1 -1
  483. package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js +8 -8
  484. package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +20 -20
  485. package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +14 -14
  486. package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +85 -85
  487. package/vscode/src/vs/workbench/contrib/files/browser/fileCommands._save.js +8 -8
  488. package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js +6 -6
  489. package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js +33 -33
  490. package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._configuration.js +52 -87
  491. package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._editorPane.js +2 -2
  492. package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +1 -1
  493. package/vscode/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.js +4 -4
  494. package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +7 -7
  495. package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js +18 -14
  496. package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +7 -7
  497. package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js +4 -4
  498. package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js +1 -1
  499. package/vscode/src/vs/workbench/contrib/files/common/files.d.ts +1 -0
  500. package/vscode/src/vs/workbench/contrib/files/common/files.js +14 -14
  501. package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js +3 -3
  502. package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js +20 -20
  503. package/vscode/src/vs/workbench/contrib/format/browser/formatActionsNone.js +4 -4
  504. package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js +1 -1
  505. package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js +4 -4
  506. package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js +73 -93
  507. package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.js +11 -18
  508. package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.js +234 -112
  509. package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.js +53 -138
  510. package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js +33 -38
  511. package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.js +249 -117
  512. package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.js +85 -44
  513. package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.js +93 -41
  514. package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css.js +1 -1
  515. package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatContentWidget.css.js +1 -1
  516. package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js +63 -45
  517. package/vscode/src/vs/workbench/contrib/list/browser/list.contribution.js +3 -0
  518. package/vscode/src/vs/workbench/contrib/list/browser/listResizeColumnAction.js +27 -0
  519. package/vscode/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.js +54 -0
  520. package/vscode/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.js +95 -25
  521. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +1 -1
  522. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +29 -29
  523. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js +2 -2
  524. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js +269 -0
  525. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget.js +40 -0
  526. package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js +8 -8
  527. package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js +1 -1
  528. package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js +58 -6
  529. package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.js +2 -1
  530. package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js +1 -1
  531. package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js +6 -6
  532. package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js +17 -17
  533. package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js +3 -3
  534. package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.js +12 -5
  535. package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.js +3 -3
  536. package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js +5 -5
  537. package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.js +2 -2
  538. package/vscode/src/vs/workbench/contrib/notebook/browser/controller/coreActions.js +4 -4
  539. package/vscode/src/vs/workbench/contrib/notebook/browser/controller/foldingController.js +3 -3
  540. package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.js +49 -0
  541. package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.js +1515 -0
  542. package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.js +266 -0
  543. package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.js +630 -0
  544. package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel.js +113 -0
  545. package/vscode/src/vs/workbench/contrib/notebook/browser/diff/eventDispatcher.js +37 -0
  546. package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css.js +4 -0
  547. package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.js +729 -0
  548. package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.js +28 -0
  549. package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.js +445 -0
  550. package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.js +184 -0
  551. package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.js +454 -0
  552. package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.js +256 -0
  553. package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput.js +45 -0
  554. package/vscode/src/vs/workbench/contrib/notebook/browser/media/notebook.css.js +1 -1
  555. package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider.js +3 -3
  556. package/vscode/src/vs/workbench/contrib/notebook/browser/notebookBrowser.js +3 -3
  557. package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditor.js +9 -9
  558. package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.js +62 -43
  559. package/vscode/src/vs/workbench/contrib/notebook/browser/notebookIcons.js +29 -29
  560. package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.js +4 -4
  561. package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.js +29 -7
  562. package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.js +13 -12
  563. package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.js +53 -14
  564. package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon.js +4 -4
  565. package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.js +1 -1
  566. package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.js +3 -3
  567. package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.js +2 -2
  568. package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.js +2 -2
  569. package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellEditorPool.js +114 -0
  570. package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.js +0 -1
  571. package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.js +1 -1
  572. package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.js +4 -4
  573. package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.js +16 -9
  574. package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.js +32 -2
  575. package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.js +2 -2
  576. package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.js +14 -5
  577. package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.js +47 -0
  578. package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.js +35 -30
  579. package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.js +2 -2
  580. package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.js +4 -0
  581. package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.js +2 -3
  582. package/vscode/src/vs/workbench/contrib/notebook/common/notebookDiffEditorInput.js +105 -0
  583. package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js +9 -3
  584. package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.js +11 -18
  585. package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js +3 -3
  586. package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesIcons.js +12 -12
  587. package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js +18 -17
  588. package/vscode/src/vs/workbench/contrib/preferences/browser/settingsLayout.js +54 -49
  589. package/vscode/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.js +21 -21
  590. package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js +15 -15
  591. package/vscode/src/vs/workbench/contrib/remote/browser/remoteIcons.js +17 -17
  592. package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js +60 -60
  593. package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js +2 -2
  594. package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +23 -23
  595. package/vscode/src/vs/workbench/contrib/scm/common/scm.js +2 -1
  596. package/vscode/src/vs/workbench/contrib/search/browser/anythingQuickAccess.js +10 -10
  597. package/vscode/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.js +4 -5
  598. package/vscode/src/vs/workbench/contrib/search/browser/searchActionsBase.js +1 -1
  599. package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js +10 -10
  600. package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js +14 -33
  601. package/vscode/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.js +2 -2
  602. package/vscode/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.js +1 -1
  603. package/vscode/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.js +2 -2
  604. package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +3 -3
  605. package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js +3 -3
  606. package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +9 -9
  607. package/vscode/src/vs/workbench/contrib/speech/common/speechService.js +29 -29
  608. package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js +5 -5
  609. package/vscode/src/vs/workbench/contrib/tasks/common/taskService.js +5 -5
  610. package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +3 -3
  611. package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.d.ts +18 -1
  612. package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +4 -4
  613. package/vscode/src/vs/workbench/contrib/terminal/browser/terminalMenus.js +32 -32
  614. package/vscode/src/vs/workbench/contrib/terminal/common/terminal.d.ts +3 -0
  615. package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js +7 -7
  616. package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +23 -23
  617. package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js +16 -16
  618. package/vscode/src/vs/workbench/contrib/terminal/common/terminalStrings.js +28 -28
  619. package/vscode/src/vs/workbench/contrib/testing/common/constants.js +11 -11
  620. package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +8 -4
  621. package/vscode/src/vs/workbench/contrib/testing/common/testTypes.d.ts +2 -1
  622. package/vscode/src/vs/workbench/contrib/url/browser/trustedDomains.js +6 -6
  623. package/vscode/src/vs/workbench/contrib/webview/browser/webview.contribution.js +3 -3
  624. package/vscode/src/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor.js +21 -2
  625. package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js +1 -1
  626. package/vscode/src/vs/workbench/contrib/workspace/common/workspace.js +2 -2
  627. package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +3 -3
  628. package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +7 -7
  629. package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolver.js +2 -1
  630. package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.js +16 -16
  631. package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.js +1 -1
  632. package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js +15 -15
  633. package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.d.ts +6 -8
  634. package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.service.d.ts +10 -3
  635. package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js +1 -1
  636. package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.js +1 -1
  637. package/vscode/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.js +6 -6
  638. package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.d.ts +2 -2
  639. package/vscode/src/vs/workbench/services/extensions/common/extensionHostManagers.d.ts +1 -0
  640. package/vscode/src/vs/workbench/services/extensions/common/extensions.d.ts +5 -0
  641. package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +83 -83
  642. package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +5 -5
  643. package/vscode/src/vs/workbench/services/language/common/languageService.js +28 -28
  644. package/vscode/src/vs/workbench/services/lifecycle/common/lifecycleService.js +3 -3
  645. package/vscode/src/vs/workbench/services/output/common/output.js +1 -2
  646. package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.js +2 -2
  647. package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.js +7 -7
  648. package/vscode/src/vs/workbench/services/preferences/common/preferencesEditorInput.js +2 -2
  649. package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js +8 -8
  650. package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +5 -5
  651. package/vscode/src/vs/workbench/services/search/common/fileSearchManager.js +62 -30
  652. package/vscode/src/vs/workbench/services/search/common/queryBuilder.js +42 -12
  653. package/vscode/src/vs/workbench/services/search/common/search.js +69 -34
  654. package/vscode/src/vs/workbench/services/search/common/searchExtConversionTypes.js +144 -0
  655. package/vscode/src/vs/workbench/services/search/common/searchExtTypes.js +9 -29
  656. package/vscode/src/vs/workbench/services/search/common/searchHelpers.js +7 -7
  657. package/vscode/src/vs/workbench/services/search/common/textSearchManager.js +77 -93
  658. package/vscode/src/vs/workbench/services/textMate/common/TMGrammars.js +9 -9
  659. package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +7 -4
  660. package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js +22 -22
  661. package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js +13 -13
  662. package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +8 -9
  663. package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js +1 -1
  664. package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js +11 -11
  665. package/vscode/src/vs/workbench/services/views/browser/viewsService.js +7 -7
  666. package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js +20 -17
  667. package/vscode-dts/vscode.proposed.aiTextSearchProviderNew.d.ts +1 -85
  668. package/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts +42 -13
  669. package/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts +5 -0
  670. package/vscode-dts/vscode.proposed.chatProvider.d.ts +1 -1
  671. package/vscode-dts/vscode.proposed.chatVariableResolver.d.ts +0 -17
  672. package/vscode-dts/vscode.proposed.contribChatParticipantDetection.d.ts +6 -0
  673. package/vscode-dts/vscode.proposed.contribDebugCreateConfiguration.d.ts +6 -0
  674. package/vscode-dts/vscode.proposed.contribSourceControlHistoryTitleMenu.d.ts +7 -0
  675. package/vscode-dts/vscode.proposed.contribViewContainerTitle.d.ts +8 -0
  676. package/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts +6 -3
  677. package/vscode-dts/vscode.proposed.extensionsAny.d.ts +1 -0
  678. package/vscode-dts/vscode.proposed.fileSearchProviderNew.d.ts +7 -6
  679. package/vscode-dts/vscode.proposed.findFiles2New.d.ts +36 -11
  680. package/vscode-dts/vscode.proposed.findTextInFilesNew.d.ts +51 -30
  681. package/vscode-dts/vscode.proposed.interactive.d.ts +0 -2
  682. package/vscode-dts/vscode.proposed.lmTools.d.ts +119 -20
  683. package/vscode-dts/vscode.proposed.notebookReplDocument.d.ts +20 -0
  684. package/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts +1 -0
  685. package/vscode-dts/vscode.proposed.testObserver.d.ts +6 -0
  686. package/vscode-dts/vscode.proposed.textSearchCompleteNew.d.ts +1 -9
  687. package/vscode-dts/vscode.proposed.textSearchProviderNew.d.ts +58 -17
  688. package/workers/editor.worker.js +1 -1
  689. package/workers/extensionHost.worker.js +1 -3
  690. package/external/vscode-marked/lib/marked.esm.js +0 -2199
  691. package/vscode/src/vs/editor/browser/services/webWorker.js +0 -57
  692. package/vscode/src/vs/editor/editor.worker.js +0 -21
  693. package/vscode-dts/vscode.proposed.authGetSessions.d.ts +0 -70
  694. package/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts +0 -338
  695. package/vscode-dts/vscode.proposed.testMessageStackTrace.d.ts +0 -38
  696. /package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{commandIds.js → controller/commandIds.js} +0 -0
@@ -0,0 +1,454 @@
1
+ import { Emitter } from '../../../../../base/common/event.js';
2
+ import { Disposable, DisposableStore, dispose } from '../../../../../base/common/lifecycle.js';
3
+ import { Schemas } from '../../../../../base/common/network.js';
4
+ import { MultiDiffEditorItem } from '../../../multiDiffEditor/browser/multiDiffSourceResolverService.js';
5
+ import { SideBySideDiffElementViewModel, SingleSideDiffElementViewModel, DiffElementPlaceholderViewModel } from './diffElementViewModel.js';
6
+ import { NOTEBOOK_DIFF_ITEM_KIND, NOTEBOOK_DIFF_ITEM_DIFF_STATE } from './notebookDiffEditorBrowser.js';
7
+ import { CellUri } from '../../common/notebookCommon.js';
8
+ class NotebookDiffViewModel extends Disposable {
9
+ get items() {
10
+ return this._items;
11
+ }
12
+ get value() {
13
+ return this.diffEditorItems
14
+ .filter(item => item.type !== 'placeholder')
15
+ .filter(item => {
16
+ if (this._includeUnchanged) {
17
+ return true;
18
+ }
19
+ if (item instanceof NotebookMultiDiffEditorCellItem) {
20
+ return item.type === 'unchanged' && item.containerType === 'unchanged' ? false : true;
21
+ }
22
+ if (item instanceof NotebookMultiDiffEditorMetadataItem) {
23
+ return item.type === 'unchanged' && item.containerType === 'unchanged' ? false : true;
24
+ }
25
+ if (item instanceof NotebookMultiDiffEditorOutputItem) {
26
+ return item.type === 'unchanged' && item.containerType === 'unchanged' ? false : true;
27
+ }
28
+ return true;
29
+ })
30
+ .filter(item => item instanceof NotebookMultiDiffEditorOutputItem ? !this.hideOutput : true)
31
+ .filter(item => item instanceof NotebookMultiDiffEditorMetadataItem ? !this.hideCellMetadata : true);
32
+ }
33
+ get hasUnchangedCells() {
34
+ return this._hasUnchangedCells === true;
35
+ }
36
+ get includeUnchanged() {
37
+ return this._includeUnchanged === true;
38
+ }
39
+ set includeUnchanged(value) {
40
+ this._includeUnchanged = value;
41
+ this._onDidChange.fire();
42
+ }
43
+ constructor(model, notebookEditorWorkerService, instantiationService, configurationService, eventDispatcher, notebookService, fontInfo, excludeUnchangedPlaceholder) {
44
+ super();
45
+ this.model = model;
46
+ this.notebookEditorWorkerService = notebookEditorWorkerService;
47
+ this.instantiationService = instantiationService;
48
+ this.configurationService = configurationService;
49
+ this.eventDispatcher = eventDispatcher;
50
+ this.notebookService = notebookService;
51
+ this.fontInfo = fontInfo;
52
+ this.excludeUnchangedPlaceholder = excludeUnchangedPlaceholder;
53
+ this.placeholderAndRelatedCells = ( new Map());
54
+ this._items = [];
55
+ this._onDidChangeItems = this._register(( new Emitter()));
56
+ this.onDidChangeItems = this._onDidChangeItems.event;
57
+ this.disposables = this._register(( new DisposableStore()));
58
+ this._onDidChange = this._register(( new Emitter()));
59
+ this.diffEditorItems = [];
60
+ this.onDidChange = this._onDidChange.event;
61
+ this.originalCellViewModels = [];
62
+ this.hideOutput = this.model.modified.notebook.transientOptions.transientOutputs || this.configurationService.getValue('notebook.diff.ignoreOutputs');
63
+ this.hideCellMetadata = this.configurationService.getValue('notebook.diff.ignoreMetadata');
64
+ this._register(this.configurationService.onDidChangeConfiguration(e => {
65
+ let triggerChange = false;
66
+ if (e.affectsConfiguration('notebook.diff.ignoreMetadata')) {
67
+ const newValue = this.configurationService.getValue('notebook.diff.ignoreMetadata');
68
+ if (newValue !== undefined && this.hideCellMetadata !== newValue) {
69
+ this.hideCellMetadata = newValue;
70
+ triggerChange = true;
71
+ }
72
+ }
73
+ if (e.affectsConfiguration('notebook.diff.ignoreOutputs')) {
74
+ const newValue = this.configurationService.getValue('notebook.diff.ignoreOutputs');
75
+ if (newValue !== undefined && this.hideOutput !== (newValue || this.model.modified.notebook.transientOptions.transientOutputs)) {
76
+ this.hideOutput = newValue || !!(this.model.modified.notebook.transientOptions.transientOutputs);
77
+ triggerChange = true;
78
+ }
79
+ }
80
+ if (triggerChange) {
81
+ this._onDidChange.fire();
82
+ }
83
+ }));
84
+ }
85
+ dispose() {
86
+ this.clear();
87
+ super.dispose();
88
+ }
89
+ clear() {
90
+ this.disposables.clear();
91
+ dispose(Array.from(( this.placeholderAndRelatedCells.keys())));
92
+ this.placeholderAndRelatedCells.clear();
93
+ dispose(this.originalCellViewModels);
94
+ this.originalCellViewModels = [];
95
+ dispose(this._items);
96
+ this._items.splice(0, this._items.length);
97
+ }
98
+ async computeDiff(token) {
99
+ const diffResult = await this.notebookEditorWorkerService.computeDiff(this.model.original.resource, this.model.modified.resource);
100
+ if (token.isCancellationRequested) {
101
+ return;
102
+ }
103
+ prettyChanges(this.model, diffResult.cellsDiff);
104
+ const { cellDiffInfo, firstChangeIndex } = computeDiff(this.model, diffResult);
105
+ if (isEqual(cellDiffInfo, this.originalCellViewModels, this.model)) {
106
+ return;
107
+ }
108
+ else {
109
+ this.updateViewModels(cellDiffInfo);
110
+ this.updateDiffEditorItems();
111
+ return { firstChangeIndex };
112
+ }
113
+ }
114
+ updateDiffEditorItems() {
115
+ this.diffEditorItems = [];
116
+ const originalSourceUri = this.model.original.resource;
117
+ const modifiedSourceUri = this.model.modified.resource;
118
+ this._hasUnchangedCells = false;
119
+ this.items.forEach(item => {
120
+ switch (item.type) {
121
+ case 'delete': {
122
+ this.diffEditorItems.push(( new NotebookMultiDiffEditorCellItem(item.original.uri, undefined, item.type, item.type)));
123
+ const originalMetadata = CellUri.generateCellPropertyUri(originalSourceUri, item.original.handle, Schemas.vscodeNotebookCellMetadata);
124
+ this.diffEditorItems.push(( new NotebookMultiDiffEditorMetadataItem(originalMetadata, undefined, item.type, item.type)));
125
+ const originalOutput = CellUri.generateCellPropertyUri(originalSourceUri, item.original.handle, Schemas.vscodeNotebookCellOutput);
126
+ this.diffEditorItems.push(( new NotebookMultiDiffEditorOutputItem(originalOutput, undefined, item.type, item.type)));
127
+ break;
128
+ }
129
+ case 'insert': {
130
+ this.diffEditorItems.push(( new NotebookMultiDiffEditorCellItem(undefined, item.modified.uri, item.type, item.type)));
131
+ const modifiedMetadata = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified.handle, Schemas.vscodeNotebookCellMetadata);
132
+ this.diffEditorItems.push(( new NotebookMultiDiffEditorMetadataItem(undefined, modifiedMetadata, item.type, item.type)));
133
+ const modifiedOutput = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified.handle, Schemas.vscodeNotebookCellOutput);
134
+ this.diffEditorItems.push(( new NotebookMultiDiffEditorOutputItem(undefined, modifiedOutput, item.type, item.type)));
135
+ break;
136
+ }
137
+ case 'modified': {
138
+ const cellType = item.checkIfInputModified() ? item.type : 'unchanged';
139
+ const containerChanged = (item.checkIfInputModified() || item.checkMetadataIfModified() || item.checkIfOutputsModified()) ? item.type : 'unchanged';
140
+ this.diffEditorItems.push(( new NotebookMultiDiffEditorCellItem(item.original.uri, item.modified.uri, cellType, containerChanged)));
141
+ const originalMetadata = CellUri.generateCellPropertyUri(originalSourceUri, item.original.handle, Schemas.vscodeNotebookCellMetadata);
142
+ const modifiedMetadata = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified.handle, Schemas.vscodeNotebookCellMetadata);
143
+ this.diffEditorItems.push(( new NotebookMultiDiffEditorMetadataItem(
144
+ originalMetadata,
145
+ modifiedMetadata,
146
+ item.checkMetadataIfModified() ? item.type : 'unchanged',
147
+ containerChanged
148
+ )));
149
+ const originalOutput = CellUri.generateCellPropertyUri(originalSourceUri, item.original.handle, Schemas.vscodeNotebookCellOutput);
150
+ const modifiedOutput = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified.handle, Schemas.vscodeNotebookCellOutput);
151
+ this.diffEditorItems.push(( new NotebookMultiDiffEditorOutputItem(
152
+ originalOutput,
153
+ modifiedOutput,
154
+ item.checkIfOutputsModified() ? item.type : 'unchanged',
155
+ containerChanged
156
+ )));
157
+ break;
158
+ }
159
+ case 'unchanged': {
160
+ this._hasUnchangedCells = true;
161
+ this.diffEditorItems.push(( new NotebookMultiDiffEditorCellItem(item.original.uri, item.modified.uri, item.type, item.type)));
162
+ const originalMetadata = CellUri.generateCellPropertyUri(originalSourceUri, item.original.handle, Schemas.vscodeNotebookCellMetadata);
163
+ const modifiedMetadata = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified.handle, Schemas.vscodeNotebookCellMetadata);
164
+ this.diffEditorItems.push(( new NotebookMultiDiffEditorMetadataItem(originalMetadata, modifiedMetadata, item.type, item.type)));
165
+ const originalOutput = CellUri.generateCellPropertyUri(originalSourceUri, item.original.handle, Schemas.vscodeNotebookCellOutput);
166
+ const modifiedOutput = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified.handle, Schemas.vscodeNotebookCellOutput);
167
+ this.diffEditorItems.push(( new NotebookMultiDiffEditorOutputItem(originalOutput, modifiedOutput, item.type, item.type)));
168
+ break;
169
+ }
170
+ }
171
+ });
172
+ this._onDidChange.fire();
173
+ }
174
+ updateViewModels(cellDiffInfo) {
175
+ const cellViewModels = createDiffViewModels(this.instantiationService, this.configurationService, this.model, this.eventDispatcher, cellDiffInfo, this.fontInfo, this.notebookService);
176
+ const oldLength = this._items.length;
177
+ this.clear();
178
+ this._items.splice(0, oldLength);
179
+ let placeholder = undefined;
180
+ this.originalCellViewModels = cellViewModels;
181
+ cellViewModels.forEach((vm, index) => {
182
+ if (vm.type === 'unchanged' && !this.excludeUnchangedPlaceholder) {
183
+ if (!placeholder) {
184
+ vm.displayIconToHideUnmodifiedCells = true;
185
+ placeholder = ( new DiffElementPlaceholderViewModel(vm.mainDocumentTextModel, vm.editorEventDispatcher, vm.initData));
186
+ this._items.push(placeholder);
187
+ const placeholderItem = placeholder;
188
+ this.disposables.add(placeholderItem.onUnfoldHiddenCells(() => {
189
+ const hiddenCellViewModels = this.placeholderAndRelatedCells.get(placeholderItem);
190
+ if (!Array.isArray(hiddenCellViewModels)) {
191
+ return;
192
+ }
193
+ const start = this._items.indexOf(placeholderItem);
194
+ this._items.splice(start, 1, ...hiddenCellViewModels);
195
+ this._onDidChangeItems.fire({ start, deleteCount: 1, elements: hiddenCellViewModels });
196
+ }));
197
+ this.disposables.add(vm.onHideUnchangedCells(() => {
198
+ const hiddenCellViewModels = this.placeholderAndRelatedCells.get(placeholderItem);
199
+ if (!Array.isArray(hiddenCellViewModels)) {
200
+ return;
201
+ }
202
+ const start = this._items.indexOf(vm);
203
+ this._items.splice(start, hiddenCellViewModels.length, placeholderItem);
204
+ this._onDidChangeItems.fire({ start, deleteCount: hiddenCellViewModels.length, elements: [placeholderItem] });
205
+ }));
206
+ }
207
+ const hiddenCellViewModels = this.placeholderAndRelatedCells.get(placeholder) || [];
208
+ hiddenCellViewModels.push(vm);
209
+ this.placeholderAndRelatedCells.set(placeholder, hiddenCellViewModels);
210
+ placeholder.hiddenCells.push(vm);
211
+ }
212
+ else {
213
+ placeholder = undefined;
214
+ this._items.push(vm);
215
+ }
216
+ });
217
+ this._onDidChangeItems.fire({ start: 0, deleteCount: oldLength, elements: this._items });
218
+ }
219
+ }
220
+ function prettyChanges(model, diffResult) {
221
+ const changes = diffResult.changes;
222
+ for (let i = 0; i < diffResult.changes.length - 1; i++) {
223
+ const curr = changes[i];
224
+ const next = changes[i + 1];
225
+ const x = curr.originalStart;
226
+ const y = curr.modifiedStart;
227
+ if (curr.originalLength === 1
228
+ && curr.modifiedLength === 0
229
+ && next.originalStart === x + 2
230
+ && next.originalLength === 0
231
+ && next.modifiedStart === y + 1
232
+ && next.modifiedLength === 1
233
+ && model.original.notebook.cells[x].getHashValue() === model.modified.notebook.cells[y + 1].getHashValue()
234
+ && model.original.notebook.cells[x + 1].getHashValue() === model.modified.notebook.cells[y].getHashValue()) {
235
+ curr.originalStart = x;
236
+ curr.originalLength = 0;
237
+ curr.modifiedStart = y;
238
+ curr.modifiedLength = 1;
239
+ next.originalStart = x + 1;
240
+ next.originalLength = 1;
241
+ next.modifiedStart = y + 2;
242
+ next.modifiedLength = 0;
243
+ i++;
244
+ }
245
+ }
246
+ }
247
+ function computeDiff(model, diffResult) {
248
+ const cellChanges = diffResult.cellsDiff.changes;
249
+ const cellDiffInfo = [];
250
+ const originalModel = model.original.notebook;
251
+ const modifiedModel = model.modified.notebook;
252
+ let originalCellIndex = 0;
253
+ let modifiedCellIndex = 0;
254
+ let firstChangeIndex = -1;
255
+ for (let i = 0; i < cellChanges.length; i++) {
256
+ const change = cellChanges[i];
257
+ for (let j = 0; j < change.originalStart - originalCellIndex; j++) {
258
+ const originalCell = originalModel.cells[originalCellIndex + j];
259
+ const modifiedCell = modifiedModel.cells[modifiedCellIndex + j];
260
+ if (originalCell.getHashValue() === modifiedCell.getHashValue()) {
261
+ cellDiffInfo.push({
262
+ originalCellIndex: originalCellIndex + j,
263
+ modifiedCellIndex: modifiedCellIndex + j,
264
+ type: 'unchanged'
265
+ });
266
+ }
267
+ else {
268
+ if (firstChangeIndex === -1) {
269
+ firstChangeIndex = cellDiffInfo.length;
270
+ }
271
+ cellDiffInfo.push({
272
+ originalCellIndex: originalCellIndex + j,
273
+ modifiedCellIndex: modifiedCellIndex + j,
274
+ type: 'modified'
275
+ });
276
+ }
277
+ }
278
+ const modifiedLCS = computeModifiedLCS(change, originalModel, modifiedModel);
279
+ if (modifiedLCS.length && firstChangeIndex === -1) {
280
+ firstChangeIndex = cellDiffInfo.length;
281
+ }
282
+ cellDiffInfo.push(...modifiedLCS);
283
+ originalCellIndex = change.originalStart + change.originalLength;
284
+ modifiedCellIndex = change.modifiedStart + change.modifiedLength;
285
+ }
286
+ for (let i = originalCellIndex; i < originalModel.cells.length; i++) {
287
+ cellDiffInfo.push({
288
+ originalCellIndex: i,
289
+ modifiedCellIndex: i - originalCellIndex + modifiedCellIndex,
290
+ type: 'unchanged'
291
+ });
292
+ }
293
+ return {
294
+ cellDiffInfo,
295
+ firstChangeIndex
296
+ };
297
+ }
298
+ function isEqual(cellDiffInfo, viewModels, model) {
299
+ if (cellDiffInfo.length !== viewModels.length) {
300
+ return false;
301
+ }
302
+ const originalModel = model.original.notebook;
303
+ const modifiedModel = model.modified.notebook;
304
+ for (let i = 0; i < viewModels.length; i++) {
305
+ const a = cellDiffInfo[i];
306
+ const b = viewModels[i];
307
+ if (a.type !== b.type) {
308
+ return false;
309
+ }
310
+ switch (a.type) {
311
+ case 'delete': {
312
+ if (originalModel.cells[a.originalCellIndex].handle !== b.original?.handle) {
313
+ return false;
314
+ }
315
+ continue;
316
+ }
317
+ case 'insert': {
318
+ if (modifiedModel.cells[a.modifiedCellIndex].handle !== b.modified?.handle) {
319
+ return false;
320
+ }
321
+ continue;
322
+ }
323
+ default: {
324
+ if (originalModel.cells[a.originalCellIndex].handle !== b.original?.handle) {
325
+ return false;
326
+ }
327
+ if (modifiedModel.cells[a.modifiedCellIndex].handle !== b.modified?.handle) {
328
+ return false;
329
+ }
330
+ continue;
331
+ }
332
+ }
333
+ }
334
+ return true;
335
+ }
336
+ function createDiffViewModels(instantiationService, configurationService, model, eventDispatcher, computedCellDiffs, fontInfo, notebookService) {
337
+ const originalModel = model.original.notebook;
338
+ const modifiedModel = model.modified.notebook;
339
+ const initData = {
340
+ metadataStatusHeight: configurationService.getValue('notebook.diff.ignoreMetadata') ? 0 : 25,
341
+ outputStatusHeight: configurationService.getValue('notebook.diff.ignoreOutputs') || !!(modifiedModel.transientOptions.transientOutputs) ? 0 : 25,
342
+ fontInfo
343
+ };
344
+ return ( computedCellDiffs.map(diff => {
345
+ switch (diff.type) {
346
+ case 'delete': {
347
+ return ( new SingleSideDiffElementViewModel(
348
+ originalModel,
349
+ modifiedModel,
350
+ originalModel.cells[diff.originalCellIndex],
351
+ undefined,
352
+ 'delete',
353
+ eventDispatcher,
354
+ initData,
355
+ notebookService
356
+ ));
357
+ }
358
+ case 'insert': {
359
+ return ( new SingleSideDiffElementViewModel(
360
+ modifiedModel,
361
+ originalModel,
362
+ undefined,
363
+ modifiedModel.cells[diff.modifiedCellIndex],
364
+ 'insert',
365
+ eventDispatcher,
366
+ initData,
367
+ notebookService
368
+ ));
369
+ }
370
+ case 'modified': {
371
+ return ( new SideBySideDiffElementViewModel(
372
+ model.modified.notebook,
373
+ model.original.notebook,
374
+ originalModel.cells[diff.originalCellIndex],
375
+ modifiedModel.cells[diff.modifiedCellIndex],
376
+ 'modified',
377
+ eventDispatcher,
378
+ initData,
379
+ notebookService
380
+ ));
381
+ }
382
+ case 'unchanged': {
383
+ return ( new SideBySideDiffElementViewModel(
384
+ model.modified.notebook,
385
+ model.original.notebook,
386
+ originalModel.cells[diff.originalCellIndex],
387
+ modifiedModel.cells[diff.modifiedCellIndex],
388
+ 'unchanged',
389
+ eventDispatcher,
390
+ initData,
391
+ notebookService
392
+ ));
393
+ }
394
+ }
395
+ }));
396
+ }
397
+ function computeModifiedLCS(change, originalModel, modifiedModel) {
398
+ const result = [];
399
+ const modifiedLen = Math.min(change.originalLength, change.modifiedLength);
400
+ for (let j = 0; j < modifiedLen; j++) {
401
+ const isTheSame = originalModel.cells[change.originalStart + j].equal(modifiedModel.cells[change.modifiedStart + j]);
402
+ result.push({
403
+ originalCellIndex: change.originalStart + j,
404
+ modifiedCellIndex: change.modifiedStart + j,
405
+ type: isTheSame ? 'unchanged' : 'modified'
406
+ });
407
+ }
408
+ for (let j = modifiedLen; j < change.originalLength; j++) {
409
+ result.push({
410
+ originalCellIndex: change.originalStart + j,
411
+ type: 'delete'
412
+ });
413
+ }
414
+ for (let j = modifiedLen; j < change.modifiedLength; j++) {
415
+ result.push({
416
+ modifiedCellIndex: change.modifiedStart + j,
417
+ type: 'insert'
418
+ });
419
+ }
420
+ return result;
421
+ }
422
+ class NotebookMultiDiffEditorItem extends MultiDiffEditorItem {
423
+ constructor(originalUri, modifiedUri, goToFileUri, type, containerType, kind, contextKeys) {
424
+ super(originalUri, modifiedUri, goToFileUri, contextKeys);
425
+ this.type = type;
426
+ this.containerType = containerType;
427
+ this.kind = kind;
428
+ }
429
+ }
430
+ class NotebookMultiDiffEditorCellItem extends NotebookMultiDiffEditorItem {
431
+ constructor(originalUri, modifiedUri, type, containerType) {
432
+ super(originalUri, modifiedUri, modifiedUri || originalUri, type, containerType, 'Cell', {
433
+ [NOTEBOOK_DIFF_ITEM_KIND.key]: 'Cell',
434
+ [NOTEBOOK_DIFF_ITEM_DIFF_STATE.key]: type
435
+ });
436
+ }
437
+ }
438
+ class NotebookMultiDiffEditorMetadataItem extends NotebookMultiDiffEditorItem {
439
+ constructor(originalUri, modifiedUri, type, containerType) {
440
+ super(originalUri, modifiedUri, modifiedUri || originalUri, type, containerType, 'Metadata', {
441
+ [NOTEBOOK_DIFF_ITEM_KIND.key]: 'Metadata',
442
+ [NOTEBOOK_DIFF_ITEM_DIFF_STATE.key]: type
443
+ });
444
+ }
445
+ }
446
+ class NotebookMultiDiffEditorOutputItem extends NotebookMultiDiffEditorItem {
447
+ constructor(originalUri, modifiedUri, type, containerType) {
448
+ super(originalUri, modifiedUri, modifiedUri || originalUri, type, containerType, 'Output', {
449
+ [NOTEBOOK_DIFF_ITEM_KIND.key]: 'Output',
450
+ [NOTEBOOK_DIFF_ITEM_DIFF_STATE.key]: type
451
+ });
452
+ }
453
+ }
454
+ export { NotebookDiffViewModel, NotebookMultiDiffEditorItem, prettyChanges };