development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 21:39:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

update xterm.js, fix #130967 fix #130406

Browse source 
Co-authored-by: Daniel Imms <daimms@microsoft.com>
This commit is contained in:
meganrogge 2021-08-19 08:09:20 -07:00
parent 873db27553
commit c2955308e5
No known key found for this signature in database
GPG key ID: 3155C8B2F0428C81
10 changed files with 48 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -84,12 +84,12 @@
"vscode-regexpp": "^3.1.0",
"vscode-ripgrep": "^1.12.0",
"vscode-textmate": "5.4.0",
"xterm": "4.14.0-beta.18",
"xterm": "4.14.0-beta.21",
"xterm-addon-search": "0.9.0-beta.4",
"xterm-addon-serialize": "0.6.0-beta.7",
"xterm-addon-unicode11": "0.3.0-beta.6",
"xterm-addon-webgl": "0.12.0-beta.8",
"xterm-headless": "4.14.0-beta.8",
"xterm-addon-webgl": "0.12.0-beta.10",
"xterm-headless": "4.14.0-beta.11",
"yauzl": "^2.9.2",
"yazl": "^2.4.3"
},

6
remote/package.json
View file

@ -24,12 +24,12 @@
"vscode-regexpp": "^3.1.0",
"vscode-ripgrep": "^1.12.0",
"vscode-textmate": "5.4.0",
"xterm": "4.14.0-beta.18",
"xterm": "4.14.0-beta.21",
"xterm-addon-search": "0.9.0-beta.4",
"xterm-addon-serialize": "0.6.0-beta.7",
"xterm-addon-unicode11": "0.3.0-beta.6",
"xterm-addon-webgl": "0.12.0-beta.8",
"xterm-headless": "4.14.0-beta.8",
"xterm-addon-webgl": "0.12.0-beta.10",
"xterm-headless": "4.14.0-beta.11",
"yauzl": "^2.9.2",
"yazl": "^2.4.3"
},

4
remote/web/package.json
View file

@ -10,9 +10,9 @@
"tas-client-umd": "0.1.4",
"vscode-oniguruma": "1.5.1",
"vscode-textmate": "5.4.0",
"xterm": "4.14.0-beta.18",
"xterm": "4.14.0-beta.21",
"xterm-addon-search": "0.9.0-beta.4",
"xterm-addon-unicode11": "0.3.0-beta.6",
"xterm-addon-webgl": "0.12.0-beta.8"
"xterm-addon-webgl": "0.12.0-beta.10"
}
}

16
remote/web/yarn.lock
View file

@ -123,12 +123,12 @@ xterm-addon-unicode11@0.3.0-beta.6:
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.3.0-beta.6.tgz#8914f377757d5078e7b4daee7d3e2b7428b6edf0"
integrity sha512-Qwa18yMhtacf9Jtxy+UuxHfjIeIjaX9q0LUfHtZU8/Lwjh+bGcn8E8IABVSGvXZgPNKw/4TqEpgLFexn+sfc5g==
xterm-addon-webgl@0.12.0-beta.8:
version "0.12.0-beta.8"
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.8.tgz#c11cc8f9065986efe48422b2bfc8427403f30d5f"
integrity sha512-T6qQlol20ezuTdEC+iwuxNFZfCej7thBqKGA5mTBXSDpXoWUw//h/f8iFU0lqNNAI0zgqIPulIiRRJRTUVM8pA==
xterm-addon-webgl@0.12.0-beta.10:
version "0.12.0-beta.10"
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.10.tgz#ba23287043da8172f4f9e53babb620f54ad36189"
integrity sha512-mzMOAqgM95FAgzcVzCH/Q0NfN0CTMHVDWCCFyg4B5ZcsuRiQKqQQw0HS+5uOQDtoZEDl2BqGFby7pGpENWGjZQ==
xterm@4.14.0-beta.18:
version "4.14.0-beta.18"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.14.0-beta.18.tgz#57a7cbf5544b6e42c7a37d016b1adf37e679e9a3"
integrity sha512-Vyr3G6C+vPEn1MLfDEkZfOhwmG5byiVM1eQ0rf+yLg8a1rz3Oa4ji4IkA6SGr3ztqQ5ZQA6Q/10Rop+1dk7PrA==
xterm@4.14.0-beta.21:
version "4.14.0-beta.21"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.14.0-beta.21.tgz#2d50328389cc79021c0202405689955fc18cb703"
integrity sha512-9ELD78FTUL91OBRfNVWh+gxEqufNNWsrFkkOFxhKBSk3YRuJdcapZBb6afobgpAaQglw8v8Ze1eBkTtctW20jQ==

24
remote/yarn.lock
View file

@ -635,20 +635,20 @@ xterm-addon-unicode11@0.3.0-beta.6:
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.3.0-beta.6.tgz#8914f377757d5078e7b4daee7d3e2b7428b6edf0"
integrity sha512-Qwa18yMhtacf9Jtxy+UuxHfjIeIjaX9q0LUfHtZU8/Lwjh+bGcn8E8IABVSGvXZgPNKw/4TqEpgLFexn+sfc5g==
xterm-addon-webgl@0.12.0-beta.8:
version "0.12.0-beta.8"
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.8.tgz#c11cc8f9065986efe48422b2bfc8427403f30d5f"
integrity sha512-T6qQlol20ezuTdEC+iwuxNFZfCej7thBqKGA5mTBXSDpXoWUw//h/f8iFU0lqNNAI0zgqIPulIiRRJRTUVM8pA==
xterm-addon-webgl@0.12.0-beta.10:
version "0.12.0-beta.10"
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.10.tgz#ba23287043da8172f4f9e53babb620f54ad36189"
integrity sha512-mzMOAqgM95FAgzcVzCH/Q0NfN0CTMHVDWCCFyg4B5ZcsuRiQKqQQw0HS+5uOQDtoZEDl2BqGFby7pGpENWGjZQ==
xterm-headless@4.14.0-beta.8:
version "4.14.0-beta.8"
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.14.0-beta.8.tgz#5591d438cb4940f8cef9a65a4cfc385ad09b9aa5"
integrity sha512-H/vZiuH7cwgGcbxIHCexFVHfCzFX8z0/yaxuDGK/G8G1DoqI3MVNFQPdugu/lkptyddD0O5Hn0dUV7hSCfxi+A==
xterm-headless@4.14.0-beta.11:
version "4.14.0-beta.11"
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.14.0-beta.11.tgz#c97052e31ab07a50c577cdcf05878e4cff76deec"
integrity sha512-EL3cK0yXvQ9BDYqcAMXGd2NkHFFknYQZ7sWgVq6xWrMcSrOMGfIpNyZ1zlP4V5pUk0+yur52TS4xumJ+fYld5w==
xterm@4.14.0-beta.18:
version "4.14.0-beta.18"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.14.0-beta.18.tgz#57a7cbf5544b6e42c7a37d016b1adf37e679e9a3"
integrity sha512-Vyr3G6C+vPEn1MLfDEkZfOhwmG5byiVM1eQ0rf+yLg8a1rz3Oa4ji4IkA6SGr3ztqQ5ZQA6Q/10Rop+1dk7PrA==
xterm@4.14.0-beta.21:
version "4.14.0-beta.21"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.14.0-beta.21.tgz#2d50328389cc79021c0202405689955fc18cb703"
integrity sha512-9ELD78FTUL91OBRfNVWh+gxEqufNNWsrFkkOFxhKBSk3YRuJdcapZBb6afobgpAaQglw8v8Ze1eBkTtctW20jQ==
yauzl@^2.9.2:
version "2.10.0"

1
src/vs/platform/terminal/common/terminal.ts
View file

@ -89,6 +89,7 @@ export const enum TerminalSettingId {
LocalEchoExcludePrograms = 'terminal.integrated.localEchoExcludePrograms',
LocalEchoStyle = 'terminal.integrated.localEchoStyle',
EnablePersistentSessions = 'terminal.integrated.enablePersistentSessions',
CustomGlyphs = 'terminal.integrated.customGlyphs',
PersistentSessionScrollback = 'terminal.integrated.persistentSessionScrollback',
PersistentSessionExperimentalSerializer = 'terminal.integrated.persistentSessionExperimentalSerializer',
InheritEnv = 'terminal.integrated.inheritEnv',

2
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
View file

@ -1511,7 +1511,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
this._safeSetOption('macOptionClickForcesSelection', config.macOptionClickForcesSelection);
this._safeSetOption('rightClickSelectsWord', config.rightClickBehavior === 'selectWord');
this._safeSetOption('wordSeparator', config.wordSeparators);
this._safeSetOption('customGlyphs', config.customGlyphs);
const suggestedRendererType = TerminalInstance._suggestedRendererType;
// @meganrogge @Tyriar remove if the issue related to iPads and webgl is resolved
if ((!isIOS && config.gpuAcceleration === 'auto' && suggestedRendererType === undefined) || config.gpuAcceleration === 'on') {

1
src/vs/workbench/contrib/terminal/common/terminal.ts
View file

@ -204,6 +204,7 @@ export interface ITerminalConfiguration {
},
bellDuration: number;
defaultLocation: TerminalLocation;
customGlyphs: boolean;
}
export const DEFAULT_LOCAL_ECHO_EXCLUDE: ReadonlyArray<string> = ['vim', 'vi', 'nano', 'tmux'];

5
src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
View file

@ -451,6 +451,11 @@ const terminalConfiguration: IConfigurationNode = {
type: 'boolean',
default: true
},
[TerminalSettingId.CustomGlyphs]: {
description: localize('terminal.integrated.customGlyphs', "Whether to draw custom glyphs for block element and box drawing characters instead of using the font, which typically yields better rendering with continuous lines. Note that this doesn't work with the DOM renderer"),
type: 'boolean',
default: true
}
}
};

24
yarn.lock
View file

@ -11112,20 +11112,20 @@ xterm-addon-unicode11@0.3.0-beta.6:
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.3.0-beta.6.tgz#8914f377757d5078e7b4daee7d3e2b7428b6edf0"
integrity sha512-Qwa18yMhtacf9Jtxy+UuxHfjIeIjaX9q0LUfHtZU8/Lwjh+bGcn8E8IABVSGvXZgPNKw/4TqEpgLFexn+sfc5g==
xterm-addon-webgl@0.12.0-beta.8:
version "0.12.0-beta.8"
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.8.tgz#c11cc8f9065986efe48422b2bfc8427403f30d5f"
integrity sha512-T6qQlol20ezuTdEC+iwuxNFZfCej7thBqKGA5mTBXSDpXoWUw//h/f8iFU0lqNNAI0zgqIPulIiRRJRTUVM8pA==
xterm-addon-webgl@0.12.0-beta.10:
version "0.12.0-beta.10"
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.10.tgz#ba23287043da8172f4f9e53babb620f54ad36189"
integrity sha512-mzMOAqgM95FAgzcVzCH/Q0NfN0CTMHVDWCCFyg4B5ZcsuRiQKqQQw0HS+5uOQDtoZEDl2BqGFby7pGpENWGjZQ==
xterm-headless@4.14.0-beta.8:
version "4.14.0-beta.8"
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.14.0-beta.8.tgz#5591d438cb4940f8cef9a65a4cfc385ad09b9aa5"
integrity sha512-H/vZiuH7cwgGcbxIHCexFVHfCzFX8z0/yaxuDGK/G8G1DoqI3MVNFQPdugu/lkptyddD0O5Hn0dUV7hSCfxi+A==
xterm-headless@4.14.0-beta.11:
version "4.14.0-beta.11"
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.14.0-beta.11.tgz#c97052e31ab07a50c577cdcf05878e4cff76deec"
integrity sha512-EL3cK0yXvQ9BDYqcAMXGd2NkHFFknYQZ7sWgVq6xWrMcSrOMGfIpNyZ1zlP4V5pUk0+yur52TS4xumJ+fYld5w==
xterm@4.14.0-beta.18:
version "4.14.0-beta.18"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.14.0-beta.18.tgz#57a7cbf5544b6e42c7a37d016b1adf37e679e9a3"
integrity sha512-Vyr3G6C+vPEn1MLfDEkZfOhwmG5byiVM1eQ0rf+yLg8a1rz3Oa4ji4IkA6SGr3ztqQ5ZQA6Q/10Rop+1dk7PrA==
xterm@4.14.0-beta.21:
version "4.14.0-beta.21"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.14.0-beta.21.tgz#2d50328389cc79021c0202405689955fc18cb703"
integrity sha512-9ELD78FTUL91OBRfNVWh+gxEqufNNWsrFkkOFxhKBSk3YRuJdcapZBb6afobgpAaQglw8v8Ze1eBkTtctW20jQ==
y18n@^3.2.1:
version "3.2.2"