diff --git a/package.json b/package.json index 92d7d139fc2..87637cea73e 100644 --- a/package.json +++ b/package.json @@ -80,14 +80,14 @@ "@vscode/windows-mutex": "^0.5.0", "@vscode/windows-process-tree": "^0.6.0", "@vscode/windows-registry": "^1.1.0", - "@xterm/addon-canvas": "0.7.0-beta.3", - "@xterm/addon-image": "0.8.0-beta.3", - "@xterm/addon-search": "0.15.0-beta.3", - "@xterm/addon-serialize": "0.13.0-beta.3", - "@xterm/addon-unicode11": "0.8.0-beta.3", - "@xterm/addon-webgl": "0.18.0-beta.3", - "@xterm/headless": "5.5.0-beta.3", - "@xterm/xterm": "5.5.0-beta.3", + "@xterm/addon-canvas": "0.7.0-beta.5", + "@xterm/addon-image": "0.8.0-beta.5", + "@xterm/addon-search": "0.15.0-beta.5", + "@xterm/addon-serialize": "0.13.0-beta.5", + "@xterm/addon-unicode11": "0.8.0-beta.5", + "@xterm/addon-webgl": "0.18.0-beta.5", + "@xterm/headless": "5.5.0-beta.5", + "@xterm/xterm": "5.5.0-beta.5", "graceful-fs": "4.2.11", "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.2", diff --git a/remote/package.json b/remote/package.json index 56e7f9e975e..32f8f74f990 100644 --- a/remote/package.json +++ b/remote/package.json @@ -13,14 +13,14 @@ "@vscode/vscode-languagedetection": "1.0.21", "@vscode/windows-process-tree": "^0.6.0", "@vscode/windows-registry": "^1.1.0", - "@xterm/addon-canvas": "0.7.0-beta.3", - "@xterm/addon-image": "0.8.0-beta.3", - "@xterm/addon-search": "0.15.0-beta.3", - "@xterm/addon-serialize": "0.13.0-beta.3", - "@xterm/addon-unicode11": "0.8.0-beta.3", - "@xterm/addon-webgl": "0.18.0-beta.3", - "@xterm/headless": "5.5.0-beta.3", - "@xterm/xterm": "5.5.0-beta.3", + "@xterm/addon-canvas": "0.7.0-beta.5", + "@xterm/addon-image": "0.8.0-beta.5", + "@xterm/addon-search": "0.15.0-beta.5", + "@xterm/addon-serialize": "0.13.0-beta.5", + "@xterm/addon-unicode11": "0.8.0-beta.5", + "@xterm/addon-webgl": "0.18.0-beta.5", + "@xterm/headless": "5.5.0-beta.5", + "@xterm/xterm": "5.5.0-beta.5", "cookie": "^0.4.0", "graceful-fs": "4.2.11", "http-proxy-agent": "^7.0.0", diff --git a/remote/web/package.json b/remote/web/package.json index 377df190971..18a7f51e21b 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -7,13 +7,13 @@ "@microsoft/1ds-post-js": "^3.2.13", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/vscode-languagedetection": "1.0.21", - "@xterm/addon-canvas": "0.7.0-beta.3", - "@xterm/addon-image": "0.8.0-beta.3", - "@xterm/addon-search": "0.15.0-beta.3", - "@xterm/addon-serialize": "0.13.0-beta.3", - "@xterm/addon-unicode11": "0.8.0-beta.3", - "@xterm/addon-webgl": "0.18.0-beta.3", - "@xterm/xterm": "5.5.0-beta.3", + "@xterm/addon-canvas": "0.7.0-beta.5", + "@xterm/addon-image": "0.8.0-beta.5", + "@xterm/addon-search": "0.15.0-beta.5", + "@xterm/addon-serialize": "0.13.0-beta.5", + "@xterm/addon-unicode11": "0.8.0-beta.5", + "@xterm/addon-webgl": "0.18.0-beta.5", + "@xterm/xterm": "5.5.0-beta.5", "jschardet": "3.0.0", "tas-client-umd": "0.1.8", "vscode-oniguruma": "1.7.0", diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index b69b9a96e3f..11834ed0728 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -48,40 +48,40 @@ resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3" integrity sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g== -"@xterm/addon-canvas@0.7.0-beta.3": - version "0.7.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.7.0-beta.3.tgz#271054deee3828b38d4ac8abfa5802c19295aaeb" - integrity sha512-pvq1h45Xhi0wAHGlXmy1tK4x/kxDmkSRtHwoCu81fplHgxa2vgIrGSwSKzRWhD3ro6ccDQhFDhpdJUDNVP4Y+w== +"@xterm/addon-canvas@0.7.0-beta.5": + version "0.7.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.7.0-beta.5.tgz#60e4b3058f7a1e35c9134b7f148db361ab6a1aaf" + integrity sha512-nKI6usYjGSB+si806kU4m38bDevCYGJUcSjWSaCeBPYQFVit1V4n9WMmkTsXkRftqn6ywEXz9fsQSY8jozYjqQ== -"@xterm/addon-image@0.8.0-beta.3": - version "0.8.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.8.0-beta.3.tgz#1fe6f872a88f6cf04596f5e8a0166da94c429ef6" - integrity sha512-5FZRF4avxTedw5f41RQ9Z7A31H0YB33tjV5aQAzSlOiwcQr5m5Q8YYWHdj/vdjfW/dbECJJlckLY3VwyNMPQuQ== +"@xterm/addon-image@0.8.0-beta.5": + version "0.8.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.8.0-beta.5.tgz#d59afc5d7784f6f2d9aad31547a37f8bbf6f2248" + integrity sha512-N+/hMtylBfVq1fDYKNg9+Mh//uGfzpvJv+PvxLJUcmpCvFyubc7pHy4AkFk05i20xd96TrUkGjWcojYj1gQeag== -"@xterm/addon-search@0.15.0-beta.3": - version "0.15.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.15.0-beta.3.tgz#f7701e0374805e1abfce167e696f9321020e198a" - integrity sha512-2otjNh5hkSvMvwZ6m9uEijhAmW+XE/xfDawteLLoM0GV8Pmt8C1EUa3/aZF7axKv7U1WmYy0Oh+TJ5mQwcBHHA== +"@xterm/addon-search@0.15.0-beta.5": + version "0.15.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.15.0-beta.5.tgz#fa7b0591ace8a4383802a2de1ce58271efab72d5" + integrity sha512-fy3OLGsm3kXgyxdhYeQpWBzJCzt3MstcMiNwqOO1KT3eXtTQ7YtwpAyBF7liEm2lxYl9SZvQ12QMhUt2OjYiog== -"@xterm/addon-serialize@0.13.0-beta.3": - version "0.13.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.13.0-beta.3.tgz#665adc0830a3c2cede399c660121650924907da9" - integrity sha512-88putapu36cKM0DBZpJ0k4Hk09JVF1B3kKtj9utXlOWNsriX5WeUH/yEWr+T8iqsnYcUsROOuC12rtoW92+uvg== +"@xterm/addon-serialize@0.13.0-beta.5": + version "0.13.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.13.0-beta.5.tgz#5c30229c99f6b0984e3b85307137a409e65e6b21" + integrity sha512-St0RnlHlIZfsAc5Cwrm2xfdybqUmZO715kIMwlk3iV35MucX6U/t2oEmHVEY/5OOIxPRVyLSQ0sauGnAdyO3wg== -"@xterm/addon-unicode11@0.8.0-beta.3": - version "0.8.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.8.0-beta.3.tgz#083092a40a7cad8ed03a41f67ad21f33048b6398" - integrity sha512-zPg5ItGawDTSayuxxIxGcLeNYPEq8bpY999/cVjckt02KxD2TJ097URWAnS0Hr7OYO9OxR4NPOOjbSNSw29OFg== +"@xterm/addon-unicode11@0.8.0-beta.5": + version "0.8.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.8.0-beta.5.tgz#b6e00aeff5973afd08e09b489b6d39c59d369667" + integrity sha512-5uspowe92g+f4Q/Xa9wdVrT644COzaSyfsmFZsH+220DsoMEgygvy3+13vY9RuoYt32ATSrD5sHRzPwrhAL20A== -"@xterm/addon-webgl@0.18.0-beta.3": - version "0.18.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.18.0-beta.3.tgz#c592be94c2230a03cb0c0501a4aafbbeac49e691" - integrity sha512-M36K2QhZl/HKVNRXftxJbn7YMaqWVqWwgW1lxyHefn2uZx1+jfSXM8EQo+PpntPuGJaUWZ3zoLv8TGz9rNJEFg== +"@xterm/addon-webgl@0.18.0-beta.5": + version "0.18.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.18.0-beta.5.tgz#4e837d21a6fb82df31d2719cfe35ab0658148c62" + integrity sha512-foHN6OPLZi6wkjxtL6iEKdq67vWsnP+dgj8KOGiOyP+RY308n/InVzOtmIy0CoEoGt+ZlWDAGfy3kk6YtSVTTQ== -"@xterm/xterm@5.5.0-beta.3": - version "5.5.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.5.0-beta.3.tgz#40b9017cbac37f7f55f227a10e37b3519ed3f39f" - integrity sha512-ukbnGJxJTFVCI6voThi04ePPtJ3NLEQSTRDskxTwgjIxfUw1s/LwGhAG2SZnQcgqtDLXjIXAslrgVRiVBQ3yXg== +"@xterm/xterm@5.5.0-beta.5": + version "5.5.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.5.0-beta.5.tgz#a2a9f2e8c1d659110d2ff82b55a13fdfbae85b78" + integrity sha512-YwjygYhl/me9VbyTX131z57J/NvwmhDlD4i8XEDwxCucUxI7FWrEabFfVWuIJR7P9V37fJ1BAsy0GGBR8dqnfQ== jschardet@3.0.0: version "3.0.0" diff --git a/remote/yarn.lock b/remote/yarn.lock index 63417331620..a79530332ce 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -114,45 +114,45 @@ resolved "https://registry.yarnpkg.com/@vscode/windows-registry/-/windows-registry-1.1.0.tgz#03dace7c29c46f658588b9885b9580e453ad21f9" integrity sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw== -"@xterm/addon-canvas@0.7.0-beta.3": - version "0.7.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.7.0-beta.3.tgz#271054deee3828b38d4ac8abfa5802c19295aaeb" - integrity sha512-pvq1h45Xhi0wAHGlXmy1tK4x/kxDmkSRtHwoCu81fplHgxa2vgIrGSwSKzRWhD3ro6ccDQhFDhpdJUDNVP4Y+w== +"@xterm/addon-canvas@0.7.0-beta.5": + version "0.7.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.7.0-beta.5.tgz#60e4b3058f7a1e35c9134b7f148db361ab6a1aaf" + integrity sha512-nKI6usYjGSB+si806kU4m38bDevCYGJUcSjWSaCeBPYQFVit1V4n9WMmkTsXkRftqn6ywEXz9fsQSY8jozYjqQ== -"@xterm/addon-image@0.8.0-beta.3": - version "0.8.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.8.0-beta.3.tgz#1fe6f872a88f6cf04596f5e8a0166da94c429ef6" - integrity sha512-5FZRF4avxTedw5f41RQ9Z7A31H0YB33tjV5aQAzSlOiwcQr5m5Q8YYWHdj/vdjfW/dbECJJlckLY3VwyNMPQuQ== +"@xterm/addon-image@0.8.0-beta.5": + version "0.8.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.8.0-beta.5.tgz#d59afc5d7784f6f2d9aad31547a37f8bbf6f2248" + integrity sha512-N+/hMtylBfVq1fDYKNg9+Mh//uGfzpvJv+PvxLJUcmpCvFyubc7pHy4AkFk05i20xd96TrUkGjWcojYj1gQeag== -"@xterm/addon-search@0.15.0-beta.3": - version "0.15.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.15.0-beta.3.tgz#f7701e0374805e1abfce167e696f9321020e198a" - integrity sha512-2otjNh5hkSvMvwZ6m9uEijhAmW+XE/xfDawteLLoM0GV8Pmt8C1EUa3/aZF7axKv7U1WmYy0Oh+TJ5mQwcBHHA== +"@xterm/addon-search@0.15.0-beta.5": + version "0.15.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.15.0-beta.5.tgz#fa7b0591ace8a4383802a2de1ce58271efab72d5" + integrity sha512-fy3OLGsm3kXgyxdhYeQpWBzJCzt3MstcMiNwqOO1KT3eXtTQ7YtwpAyBF7liEm2lxYl9SZvQ12QMhUt2OjYiog== -"@xterm/addon-serialize@0.13.0-beta.3": - version "0.13.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.13.0-beta.3.tgz#665adc0830a3c2cede399c660121650924907da9" - integrity sha512-88putapu36cKM0DBZpJ0k4Hk09JVF1B3kKtj9utXlOWNsriX5WeUH/yEWr+T8iqsnYcUsROOuC12rtoW92+uvg== +"@xterm/addon-serialize@0.13.0-beta.5": + version "0.13.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.13.0-beta.5.tgz#5c30229c99f6b0984e3b85307137a409e65e6b21" + integrity sha512-St0RnlHlIZfsAc5Cwrm2xfdybqUmZO715kIMwlk3iV35MucX6U/t2oEmHVEY/5OOIxPRVyLSQ0sauGnAdyO3wg== -"@xterm/addon-unicode11@0.8.0-beta.3": - version "0.8.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.8.0-beta.3.tgz#083092a40a7cad8ed03a41f67ad21f33048b6398" - integrity sha512-zPg5ItGawDTSayuxxIxGcLeNYPEq8bpY999/cVjckt02KxD2TJ097URWAnS0Hr7OYO9OxR4NPOOjbSNSw29OFg== +"@xterm/addon-unicode11@0.8.0-beta.5": + version "0.8.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.8.0-beta.5.tgz#b6e00aeff5973afd08e09b489b6d39c59d369667" + integrity sha512-5uspowe92g+f4Q/Xa9wdVrT644COzaSyfsmFZsH+220DsoMEgygvy3+13vY9RuoYt32ATSrD5sHRzPwrhAL20A== -"@xterm/addon-webgl@0.18.0-beta.3": - version "0.18.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.18.0-beta.3.tgz#c592be94c2230a03cb0c0501a4aafbbeac49e691" - integrity sha512-M36K2QhZl/HKVNRXftxJbn7YMaqWVqWwgW1lxyHefn2uZx1+jfSXM8EQo+PpntPuGJaUWZ3zoLv8TGz9rNJEFg== +"@xterm/addon-webgl@0.18.0-beta.5": + version "0.18.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.18.0-beta.5.tgz#4e837d21a6fb82df31d2719cfe35ab0658148c62" + integrity sha512-foHN6OPLZi6wkjxtL6iEKdq67vWsnP+dgj8KOGiOyP+RY308n/InVzOtmIy0CoEoGt+ZlWDAGfy3kk6YtSVTTQ== -"@xterm/headless@5.5.0-beta.3": - version "5.5.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.5.0-beta.3.tgz#d58d07b5d5e08987cc0cd5888f28f4750627c286" - integrity sha512-F5AdR4VPBmCQGcc57zGTHTT5JZyAUWpBxxY+vclrH/AVxnf9/5uRcSdCmXc8Y558FtdVynG31k48c6fd9n1vVw== +"@xterm/headless@5.5.0-beta.5": + version "5.5.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.5.0-beta.5.tgz#82cc06c4f953153265c8cdf4de2e0c0850e7c08a" + integrity sha512-b5YTT6CdoGixu9YIdccZC845Xrsm44c9xPG109rX7ksUqaur+TnwZqIsXXIZKo/roHKRJvYQDfV7o016KDVLew== -"@xterm/xterm@5.5.0-beta.3": - version "5.5.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.5.0-beta.3.tgz#40b9017cbac37f7f55f227a10e37b3519ed3f39f" - integrity sha512-ukbnGJxJTFVCI6voThi04ePPtJ3NLEQSTRDskxTwgjIxfUw1s/LwGhAG2SZnQcgqtDLXjIXAslrgVRiVBQ3yXg== +"@xterm/xterm@5.5.0-beta.5": + version "5.5.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.5.0-beta.5.tgz#a2a9f2e8c1d659110d2ff82b55a13fdfbae85b78" + integrity sha512-YwjygYhl/me9VbyTX131z57J/NvwmhDlD4i8XEDwxCucUxI7FWrEabFfVWuIJR7P9V37fJ1BAsy0GGBR8dqnfQ== agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0: version "7.1.0" diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts index 439bf4827aa..3a27c6d7a0c 100644 --- a/src/vs/platform/terminal/common/terminal.ts +++ b/src/vs/platform/terminal/common/terminal.ts @@ -103,6 +103,7 @@ export const enum TerminalSettingId { PersistentSessionReviveProcess = 'terminal.integrated.persistentSessionReviveProcess', HideOnStartup = 'terminal.integrated.hideOnStartup', CustomGlyphs = 'terminal.integrated.customGlyphs', + RescaleOverlappingGlyphs = 'terminal.integrated.rescaleOverlappingGlyphs', PersistentSessionScrollback = 'terminal.integrated.persistentSessionScrollback', InheritEnv = 'terminal.integrated.inheritEnv', ShowLinkHover = 'terminal.integrated.showLinkHover', diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts index 0f2ef8f01f4..c304610faa7 100644 --- a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts +++ b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts @@ -244,7 +244,8 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach scrollSensitivity: config.mouseWheelScrollSensitivity, wordSeparator: config.wordSeparators, overviewRulerWidth: 10, - ignoreBracketedPasteMode: config.ignoreBracketedPasteMode + ignoreBracketedPasteMode: config.ignoreBracketedPasteMode, + rescaleOverlappingGlyphs: config.rescaleOverlappingGlyphs, })); this._updateSmoothScrolling(); this._core = (this.raw as any)._core as IXtermCore; @@ -404,6 +405,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach this.raw.options.wordSeparator = config.wordSeparators; this.raw.options.customGlyphs = config.customGlyphs; this.raw.options.ignoreBracketedPasteMode = config.ignoreBracketedPasteMode; + this.raw.options.rescaleOverlappingGlyphs = config.rescaleOverlappingGlyphs; this._updateSmoothScrolling(); if (this._attached?.options.enableGpu) { if (this._shouldLoadWebgl()) { diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts index 60c5b601e8a..d2ac113bfbd 100644 --- a/src/vs/workbench/contrib/terminal/common/terminal.ts +++ b/src/vs/workbench/contrib/terminal/common/terminal.ts @@ -204,6 +204,7 @@ export interface ITerminalConfiguration { enableImages: boolean; smoothScrolling: boolean; ignoreBracketedPasteMode: boolean; + rescaleOverlappingGlyphs: boolean; } export const DEFAULT_LOCAL_ECHO_EXCLUDE: ReadonlyArray = ['vim', 'vi', 'nano', 'tmux']; diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts index ecf3050bb43..bdc76cdf957 100644 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts @@ -560,6 +560,11 @@ const terminalConfiguration: IConfigurationNode = { type: 'boolean', default: true }, + [TerminalSettingId.RescaleOverlappingGlyphs]: { + markdownDescription: localize('terminal.integrated.rescaleOverlappingGlyphs', "Whether to rescale glyphs horizontally that are a single cell wide but have glyphs that would overlap following cell(s). This typically happens for ambiguous width characters (eg. the roman numeral characters U+2160+) which aren't featured in monospace fonts. Emoji glyphs are never rescaled."), + type: 'boolean', + default: false + }, [TerminalSettingId.AutoReplies]: { markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VS Code if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'), type: 'object', diff --git a/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts b/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts index 804e91a26e8..b631467511e 100644 --- a/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts +++ b/src/vs/workbench/services/extensions/common/extensionsApiProposals.ts @@ -106,11 +106,13 @@ export const allApiProposals = Object.freeze({ tabInputTextMerge: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts', taskPresentationGroup: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskPresentationGroup.d.ts', telemetry: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.telemetry.d.ts', + terminalBuffer: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalBuffer.d.ts', terminalDataWriteEvent: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalDataWriteEvent.d.ts', terminalDimensions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalDimensions.d.ts', terminalExecuteCommandEvent: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalExecuteCommandEvent.d.ts', terminalQuickFixProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalQuickFixProvider.d.ts', terminalSelection: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalSelection.d.ts', + terminalShellIntegration: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts', testCoverage: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testCoverage.d.ts', testObserver: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testObserver.d.ts', textSearchProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.textSearchProvider.d.ts', diff --git a/yarn.lock b/yarn.lock index 9463669ba0d..43ff0747b1d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1700,45 +1700,45 @@ resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8" integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw== -"@xterm/addon-canvas@0.7.0-beta.3": - version "0.7.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.7.0-beta.3.tgz#271054deee3828b38d4ac8abfa5802c19295aaeb" - integrity sha512-pvq1h45Xhi0wAHGlXmy1tK4x/kxDmkSRtHwoCu81fplHgxa2vgIrGSwSKzRWhD3ro6ccDQhFDhpdJUDNVP4Y+w== +"@xterm/addon-canvas@0.7.0-beta.5": + version "0.7.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.7.0-beta.5.tgz#60e4b3058f7a1e35c9134b7f148db361ab6a1aaf" + integrity sha512-nKI6usYjGSB+si806kU4m38bDevCYGJUcSjWSaCeBPYQFVit1V4n9WMmkTsXkRftqn6ywEXz9fsQSY8jozYjqQ== -"@xterm/addon-image@0.8.0-beta.3": - version "0.8.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.8.0-beta.3.tgz#1fe6f872a88f6cf04596f5e8a0166da94c429ef6" - integrity sha512-5FZRF4avxTedw5f41RQ9Z7A31H0YB33tjV5aQAzSlOiwcQr5m5Q8YYWHdj/vdjfW/dbECJJlckLY3VwyNMPQuQ== +"@xterm/addon-image@0.8.0-beta.5": + version "0.8.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.8.0-beta.5.tgz#d59afc5d7784f6f2d9aad31547a37f8bbf6f2248" + integrity sha512-N+/hMtylBfVq1fDYKNg9+Mh//uGfzpvJv+PvxLJUcmpCvFyubc7pHy4AkFk05i20xd96TrUkGjWcojYj1gQeag== -"@xterm/addon-search@0.15.0-beta.3": - version "0.15.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.15.0-beta.3.tgz#f7701e0374805e1abfce167e696f9321020e198a" - integrity sha512-2otjNh5hkSvMvwZ6m9uEijhAmW+XE/xfDawteLLoM0GV8Pmt8C1EUa3/aZF7axKv7U1WmYy0Oh+TJ5mQwcBHHA== +"@xterm/addon-search@0.15.0-beta.5": + version "0.15.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.15.0-beta.5.tgz#fa7b0591ace8a4383802a2de1ce58271efab72d5" + integrity sha512-fy3OLGsm3kXgyxdhYeQpWBzJCzt3MstcMiNwqOO1KT3eXtTQ7YtwpAyBF7liEm2lxYl9SZvQ12QMhUt2OjYiog== -"@xterm/addon-serialize@0.13.0-beta.3": - version "0.13.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.13.0-beta.3.tgz#665adc0830a3c2cede399c660121650924907da9" - integrity sha512-88putapu36cKM0DBZpJ0k4Hk09JVF1B3kKtj9utXlOWNsriX5WeUH/yEWr+T8iqsnYcUsROOuC12rtoW92+uvg== +"@xterm/addon-serialize@0.13.0-beta.5": + version "0.13.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.13.0-beta.5.tgz#5c30229c99f6b0984e3b85307137a409e65e6b21" + integrity sha512-St0RnlHlIZfsAc5Cwrm2xfdybqUmZO715kIMwlk3iV35MucX6U/t2oEmHVEY/5OOIxPRVyLSQ0sauGnAdyO3wg== -"@xterm/addon-unicode11@0.8.0-beta.3": - version "0.8.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.8.0-beta.3.tgz#083092a40a7cad8ed03a41f67ad21f33048b6398" - integrity sha512-zPg5ItGawDTSayuxxIxGcLeNYPEq8bpY999/cVjckt02KxD2TJ097URWAnS0Hr7OYO9OxR4NPOOjbSNSw29OFg== +"@xterm/addon-unicode11@0.8.0-beta.5": + version "0.8.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.8.0-beta.5.tgz#b6e00aeff5973afd08e09b489b6d39c59d369667" + integrity sha512-5uspowe92g+f4Q/Xa9wdVrT644COzaSyfsmFZsH+220DsoMEgygvy3+13vY9RuoYt32ATSrD5sHRzPwrhAL20A== -"@xterm/addon-webgl@0.18.0-beta.3": - version "0.18.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.18.0-beta.3.tgz#c592be94c2230a03cb0c0501a4aafbbeac49e691" - integrity sha512-M36K2QhZl/HKVNRXftxJbn7YMaqWVqWwgW1lxyHefn2uZx1+jfSXM8EQo+PpntPuGJaUWZ3zoLv8TGz9rNJEFg== +"@xterm/addon-webgl@0.18.0-beta.5": + version "0.18.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.18.0-beta.5.tgz#4e837d21a6fb82df31d2719cfe35ab0658148c62" + integrity sha512-foHN6OPLZi6wkjxtL6iEKdq67vWsnP+dgj8KOGiOyP+RY308n/InVzOtmIy0CoEoGt+ZlWDAGfy3kk6YtSVTTQ== -"@xterm/headless@5.5.0-beta.3": - version "5.5.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.5.0-beta.3.tgz#d58d07b5d5e08987cc0cd5888f28f4750627c286" - integrity sha512-F5AdR4VPBmCQGcc57zGTHTT5JZyAUWpBxxY+vclrH/AVxnf9/5uRcSdCmXc8Y558FtdVynG31k48c6fd9n1vVw== +"@xterm/headless@5.5.0-beta.5": + version "5.5.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.5.0-beta.5.tgz#82cc06c4f953153265c8cdf4de2e0c0850e7c08a" + integrity sha512-b5YTT6CdoGixu9YIdccZC845Xrsm44c9xPG109rX7ksUqaur+TnwZqIsXXIZKo/roHKRJvYQDfV7o016KDVLew== -"@xterm/xterm@5.5.0-beta.3": - version "5.5.0-beta.3" - resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.5.0-beta.3.tgz#40b9017cbac37f7f55f227a10e37b3519ed3f39f" - integrity sha512-ukbnGJxJTFVCI6voThi04ePPtJ3NLEQSTRDskxTwgjIxfUw1s/LwGhAG2SZnQcgqtDLXjIXAslrgVRiVBQ3yXg== +"@xterm/xterm@5.5.0-beta.5": + version "5.5.0-beta.5" + resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.5.0-beta.5.tgz#a2a9f2e8c1d659110d2ff82b55a13fdfbae85b78" + integrity sha512-YwjygYhl/me9VbyTX131z57J/NvwmhDlD4i8XEDwxCucUxI7FWrEabFfVWuIJR7P9V37fJ1BAsy0GGBR8dqnfQ== "@xtuc/ieee754@^1.2.0": version "1.2.0"