Merge from vscode fcf3346a8e9f5ee1e00674461d9e2c2292a14ee3 #12295
Conversation
|
not sure if we should be merging ADS 'main' into this branch because the merge bot is doing that |
|
@cssuh the branch had merge conflicts with main so we'd either need to (1) merge main into the branch (2) update the PR from the bot to pickup more recent main\vscode changes or (3) manually resolve the merge conflicts without merging. I think merging main seems like the most straightforward way to resolve the conflicts since (2) would reset a lot of the work to get this ready. Let's get this PR in once the CI builds are clean and we can fixup what ever we need to in the bot to finish catching up the merge. Let's chat about how best to handle in the future. |
|
All the checks are passing on this. Though there are still some issues that need follow-up. e.g smoke tests and web builds. Let's take this to get the vscode merges in and then I'll resolve the remaining issues separately. |
* Merge from vscode fcf3346 * Fix test build break * Update distro * Fix build errors * Update distro * Update REH build file * Update build task names for REL * Fix product build yaml * Fix product REH task name * Fix type in task name * Update linux build step * Update windows build tasks * Turn off server publish * Disable REH * Fix typo * Bump distro * Update vscode tests * Bump distro * Fix type in disto * Bump distro * Turn off docker build * Remove docker step from release Co-authored-by: ADS Merger <andresse@microsoft.com> Co-authored-by: Karl Burtram <karlb@microsoft.com>
microsoft/vscode@fcf3346 Web - try to detect native fullscreen (https://www.github.com/microsoft/vscode/issues/106479)
microsoft/vscode@e13875b Only prevent default for copy paste in webviews when on electron
microsoft/vscode@51dc319 Move webview editor into own module
microsoft/vscode@5801561 fix https://www.github.com/microsoft/vscode/issues/105735.
microsoft/vscode@33c24b8 Fix cell state persisted with wrong index
microsoft/vscode@9b4bc5a applyEdits.
microsoft/vscode@475b674 Closes https://www.github.com/microsoft/vscode/issues/106683 - adds view title tooltips
microsoft/vscode@0012b4c Merge pull request https://www.github.com/microsoft/vscode/issues/106523 from microsoft/raymondzhao/activitybarmoveaction
microsoft/vscode@f7131a4 Persist cell view states by index instead of handle Fix https://www.github.com/microsoft/vscode/issues/106670
microsoft/vscode@caa87aa Merge pull request https://www.github.com/microsoft/vscode/issues/106601 from vuongggggg/fix/add-missing-dep-for-devcontainer
microsoft/vscode@91bac85 Defer all resize events for git bash terminals
microsoft/vscode@f9bc165 Fix https://www.github.com/microsoft/vscode/issues/105597: New Search Editor focuses results instead of query input when seeded (use focusResults: false by default)
microsoft/vscode@1025f4a remove unused import
microsoft/vscode@84d817b fix TS 4.1 errors
microsoft/vscode@85304e3 Revert "Fix https://www.github.com/microsoft/vscode/issues/90890"
microsoft/vscode@f096f59 refine test for microsoft/vscode#106657 and document issue with fragments and the editor opener
microsoft/vscode@98ee376 remove web filter
microsoft/vscode@c67bd02 enable web server only in server less
microsoft/vscode@b9aa43a fixes https://www.github.com/microsoft/vscode/issues/100172
microsoft/vscode@f69faf4 fixes https://www.github.com/microsoft/vscode/issues/86180
microsoft/vscode@a6ae00a add regression test for microsoft/vscode#106657
microsoft/vscode@863acba fix bad classList usage
microsoft/vscode@5a68333 notebook - when creating a notebook, check that no notebook with another viewtype exists
microsoft/vscode@ed24319 fixes https://www.github.com/microsoft/vscode/issues/106406
microsoft/vscode@68410ab debt - make class list utils functions so that @deprecated works for them
microsoft/vscode@db78402 update search files
microsoft/vscode@3761ee6 workaround, maybe fix for microsoft/vscode#106657
microsoft/vscode@883da59 remove deprecated function calls
microsoft/vscode@efc7cb3 use debian stretch images (https://www.github.com/microsoft/vscode/issues/106656)
microsoft/vscode@68ff54f rename RunOnceScheduler#timeout to delay
microsoft/vscode@90a2bed fix delay issue for provideCodeLenses, microsoft/vscode#106267
microsoft/vscode@933bdbc add NotebookCell#index, microsoft/vscode#106637
microsoft/vscode@b929102 adopt notebook integration tests, microsoft/vscode#105283
microsoft/vscode@8427414 WorkspaceEdit-api changes, microsoft/vscode#105283
microsoft/vscode@06377cf NotebookEditorEdit-api changes, microsoft/vscode#105283
microsoft/vscode@ef4df1d remove old renderCodicons-function, rename renderCodiconsAsElement to renderCodicons
microsoft/vscode@e3380f2 don't use renderCodicons any more, microsoft/vscode#105799
microsoft/vscode@d3e19e4 Skip formatting when during format-on-save, the configured formatter cannot be found (continue to show silent notification), microsoft/vscode#106376
microsoft/vscode@cca20eb Revert "API proposal for tree item icon color"
microsoft/vscode@cc899f1 Create webview.web.contribution
microsoft/vscode@02e6fa2 Use Set instead of array
microsoft/vscode@8a6b38e use optional chaining
microsoft/vscode@3e71592 Add comment to WebviewViewResolveContext
microsoft/vscode@2fb42c3 Add optional typing for webview state in WebviewPanelSerializer
microsoft/vscode@db01f71 hide outputs if it is transient.
microsoft/vscode@402092d fix https://www.github.com/microsoft/vscode/issues/106430.
microsoft/vscode@122fc9a debug: update js-debug
microsoft/vscode@352a390 Add preferred_username to the list of msft token claims (https://www.github.com/microsoft/vscode/issues/106511)
microsoft/vscode@c53524a cell language should not be freezed.
microsoft/vscode@59dcc5c notebook document data loss.
microsoft/vscode@07ad5d6 Remove unused 'SettingSearch' issue type
microsoft/vscode@5c76fc5 Update Codicons: add 'magnet' icon microsoft/vscode-codicons@https://github.com/microsoft/vscode/commit/4c6115529dd1fa20b635f32f9271f50030b0722e
microsoft/vscode@b0a913b explorer: Should maintain row focus after deleting a file
microsoft/vscode@133d95e adopt new amd loader with support for TrustedScriptURL, add typings for TrustedTypesFactory et al, microsoft/vscode#106396
microsoft/vscode@c2da750 do not use deprecated dom helper methods
microsoft/vscode@93c96b6 debug and explroer: do not use dom.addClass, dom.toggleClass
microsoft/vscode@2920016 do not use hasClass and first
microsoft/vscode@1fccb9e proxy authentication does not work on 1.49 (https://www.github.com/microsoft/vscode/issues/106434)
microsoft/vscode@bc38b0a argh
microsoft/vscode@bea7a23 fix linux build
microsoft/vscode@1f1ac9a update distro
microsoft/vscode@e75b1a6 Merge branch 'joao/linux-arm'
microsoft/vscode@13aca0a debt - remove some any casts from window
microsoft/vscode@8e12a92 Remove Schemas.vscodeRemote from simple file dialog
microsoft/vscode@3994ae4 Trusted types - don't use innerHTML for rapid render, microsoft/vscode#106395
microsoft/vscode@a46ba1f 🆙 web playground
microsoft/vscode@7c20c3f Merge pull request https://www.github.com/microsoft/vscode/issues/106374 from microsoft/dependabot/npm_and_yarn/extensions/css-language-features/server/yargs-parser-13.1.2
microsoft/vscode@55a7f0a update search file, microsoft/vscode#106395
microsoft/vscode@8784732 electron - set spellcheck: false again for windows
microsoft/vscode@37a11b4 try to fix build (linux)
microsoft/vscode@2e2d14c some jsdoc for microsoft/vscode#54938
microsoft/vscode@40827f3 fix fonts in monaco menu
microsoft/vscode@2c1dd10 Fix some trusted type violations, https://www.github.com/microsoft/vscode/issues/106395
microsoft/vscode@62b70e6 update exploration branch
microsoft/vscode@4aefd43 remove spliceNotebook api from textmodel.
microsoft/vscode@58d9622 unit tests for batched edits.
microsoft/vscode@ee11170 Pin blob storage dep see Azure/azure-sdk-for-jshttps://www.github.com/microsoft/vscode/issues/11187
microsoft/vscode@310e5a9 Replace our arrays.find with stdlib find
microsoft/vscode@d82bb0e Improve views contribution point
microsoft/vscode@f731c6f Document view.type contribution
microsoft/vscode@7daf6e1 fix build.
microsoft/vscode@5ae0dc0 💄
microsoft/vscode@f3c42d8 do not copy execution related metadata
microsoft/vscode@ea02bca replace insertCell with applyEdit.
microsoft/vscode@f88fca5 applyEdit supports begin/end selections.
microsoft/vscode@2103630 private outputs slice and unknown change.
microsoft/vscode@f042627 notebook text model initialization does not increment version
microsoft/vscode@b37c4b0 re https://www.github.com/microsoft/vscode/issues/105735. batch apply edits.
microsoft/vscode@c59d5dd - reload only local user configuration after initi - add perf mark up and logs
microsoft/vscode@a45fa6e Use @example tags in vscode.d.ts (https://www.github.com/microsoft/vscode/issues/106352)
microsoft/vscode@ad451c4 Fix one innerHTML usage https://www.github.com/microsoft/vscode/issues/106395
microsoft/vscode@2e56d31 use textcontent in menu css refs https://www.github.com/microsoft/vscode/issues/106395
microsoft/vscode@70a3975 Use textContnet for style element
microsoft/vscode@eba1cc8 Remove arrays.findIndex
microsoft/vscode@a9a7cf1 Bump yargs-parser in /extensions/markdown-language-features (https://www.github.com/microsoft/vscode/issues/106373)
microsoft/vscode@4c67705 refs https://www.github.com/microsoft/vscode/issues/106358
microsoft/vscode@7fdda46 some integration tests for notebook editing, microsoft/vscode#105283
microsoft/vscode@6e02276 debt - adopt defaultUriScheme over hardcoded vscode-remote in toLocalResource
microsoft/vscode@b1b5b8a debt - adopt defaultUriScheme also for userHome
microsoft/vscode@e37e0ff Adjust active terminal tab when active tab moves (https://www.github.com/microsoft/vscode/issues/106413)
microsoft/vscode@e73d3a8 pathService - defaultUriScheme() => defaultUriScheme
microsoft/vscode@e0d5fae fixes https://www.github.com/microsoft/vscode/issues/106355
microsoft/vscode@246aab4 debt - REMOTE_HOST_SCHEME => Schemas.vscodeRemote
microsoft/vscode@7651656 Avoid innerHTML (https://www.github.com/microsoft/vscode/issues/106395)
microsoft/vscode@01b1902 Avoid innerHTML (https://www.github.com/microsoft/vscode/issues/106395)
microsoft/vscode@cc9415c Fix https://www.github.com/microsoft/vscode/issues/106303
microsoft/vscode@3d6d718 💄
microsoft/vscode@8c13421 Add defaultUriScheme to path service (https://www.github.com/microsoft/vscode/issues/106400)
microsoft/vscode@149f31e fixes https://www.github.com/microsoft/vscode/issues/104047
microsoft/vscode@abb9c8d Correct linux code-workspace path
microsoft/vscode@c334da1 Multi git executable paths (https://www.github.com/microsoft/vscode/issues/85954)
microsoft/vscode@3271ccc Correct path to code-workspace.xml
microsoft/vscode@a5a54ad web - fix bad credentials lookup
microsoft/vscode@015c3af fixes https://www.github.com/microsoft/vscode/issues/106334
microsoft/vscode@e38b9d0 add ExtHostFileSystemInfo which knows what schemes are reserved and which are used, microsoft/vscode#91697
microsoft/vscode@9a2a941 debug: return result of a msg to debug adapter can be undefined
microsoft/vscode@371f630 Merge pull request https://www.github.com/microsoft/vscode/issues/106378 from mjbvz/add-isWritableFileSystem
microsoft/vscode@44699b0 Fix Trusted Types violations (round https://www.github.com/microsoft/vscode/issues/2) https://www.github.com/microsoft/vscode/issues/106395
microsoft/vscode@01f9355 debt - simplify metadata edit because we now have CellEditType.DocumentMetadata
microsoft/vscode@533ca9b Adress https://www.github.com/microsoft/vscode/issues/106358: Fix TS 4.1 errors in codebase
microsoft/vscode@26803ce Fix TS 4.1 errors for tasks and remote explorer Part of https://www.github.com/microsoft/vscode/issues/106358
microsoft/vscode@226c417 update trusted types search
microsoft/vscode@72f468f more TS 4.1 fixes (https://www.github.com/microsoft/vscode/issues/106358)
microsoft/vscode@41794e5 trusted types
microsoft/vscode@663810e Adds commands for --no-verify commit variants (https://www.github.com/microsoft/vscode/issues/106335)
microsoft/vscode@82d953a pinned tabs - add a tab.lastPinnedBorder color
microsoft/vscode@6173cf8 pinned tabs - closing pinned tab should open next non-pinned
microsoft/vscode@25081cd fix ts errors
microsoft/vscode@a443309 Merge pull request https://www.github.com/microsoft/vscode/issues/106385 from microsoft/ben/pinned-tabs-setting
microsoft/vscode@c591f8b fix TS 4.1 compile errors, microsoft/vscode#106358
microsoft/vscode@76e7cbb fix some TS 4.1 errors (https://www.github.com/microsoft/vscode/issues/106358)
microsoft/vscode@3fb8967 fix some TS 4.1 errors (https://www.github.com/microsoft/vscode/issues/106358)
microsoft/vscode@ec8016f Cache webview view title across reloads
microsoft/vscode@cf38af8 Revert "Fix https://www.github.com/microsoft/vscode/issues/106303"
microsoft/vscode@3f8f022 Use destructuring to make code more clear
microsoft/vscode@8e5eed1 Fix https://www.github.com/microsoft/vscode/issues/106303
microsoft/vscode@03960a5 re https://www.github.com/microsoft/vscode/issues/105735. no more udpateMetadata api.
microsoft/vscode@73a3c9d re https://www.github.com/microsoft/vscode/issues/105735.
microsoft/vscode@7e62739 debug: bump js-debug-companion
microsoft/vscode@cceaf14 https://www.github.com/microsoft/vscode/issues/106358
microsoft/vscode@80b1a77 Enable webview commands for webview views
microsoft/vscode@6cf52e3 Mark property readonly
microsoft/vscode@889fe17 💄
microsoft/vscode@69f2632 initialize notebook text model data only through ctor.
microsoft/vscode@a037570 Update Codicons: add 'graph-left' microsoft/vscode-codicons@https://github.com/microsoft/vscode/commit/dd1edb245d2217efcfb931c293b77b78e634e59a
microsoft/vscode@6821292 Fix ts 4.1 issues in terminal api tests
microsoft/vscode@d55efd8 Fix terminal ts 4.1 compile issues
microsoft/vscode@ebff341 Add subscribers action
microsoft/vscode@424a2bf refs https://www.github.com/microsoft/vscode/issues/106285
microsoft/vscode@ee5ee9e chore, simply notebook text model event emitter
microsoft/vscode@8bc3145 move dirty state to NotebookEditorModel.
microsoft/vscode@4e70e4a fix https://www.github.com/microsoft/vscode/issues/105916. expand metadata section if modified.
microsoft/vscode@e491efb replace changeCellLanguage to applyEdit
microsoft/vscode@eb7f042 remove selections from nb text model.
microsoft/vscode@deaf9f2 💂 polish nb tests.
microsoft/vscode@eb05b79 do not need isUntitled.
microsoft/vscode@9753398 debt - invoke resolve notebook when opening a notebook in an editor, not when loading a notebook from source
microsoft/vscode@e40d854 debt - IMainNotebookController#removeNotebookDocument
microsoft/vscode@5cdf679 Add explicit undefined parameters / types
microsoft/vscode@fecec73 Update Codicons - Update 'pinned' - Add 'export' - Compress 'merge' microsoft/vscode-codicons@https://github.com/microsoft/vscode/commit/5bcb1a045413eb5a9737e6e46411e13f9c4e5c9c
microsoft/vscode@f3532c9 chore - use workingCopyService.isDirty instead notebook.isDirty
microsoft/vscode@7e0c1aa Don't use async on abstract functions
microsoft/vscode@c348165 Adding more explicit typings for promises
microsoft/vscode@2a95424 Only allow configurePlugin against main TS Server
microsoft/vscode@c1e9502 Save prompt is shown while saving from settings split json editor (fix https://www.github.com/microsoft/vscode/issues/106330)
microsoft/vscode@f41efe5 Merge branch 'master' into pr/85074
microsoft/vscode@d9d314e Update extensions/git/src/commands.ts
microsoft/vscode@bec65e8 Update extensions/git/src/commands.ts
microsoft/vscode@9ff783b Update extensions/git/src/commands.ts
microsoft/vscode@c8bf916 Add cursor change after revert or stage changes