@theia/core 1.78.0-next.19 → 1.78.0-next.28

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 (78) hide show
  1. package/lib/browser/catalog.json +52 -0
  2. package/lib/browser/common-frontend-contribution.js +4 -4
  3. package/lib/browser/common-frontend-contribution.js.map +1 -1
  4. package/lib/browser/saveable.d.ts +1 -1
  5. package/lib/browser/saveable.d.ts.map +1 -1
  6. package/lib/browser/saveable.js +18 -0
  7. package/lib/browser/saveable.js.map +1 -1
  8. package/lib/browser/shell/application-shell.d.ts.map +1 -1
  9. package/lib/browser/shell/application-shell.js +13 -1
  10. package/lib/browser/shell/application-shell.js.map +1 -1
  11. package/lib/browser/shell/tab-bars.d.ts +71 -1
  12. package/lib/browser/shell/tab-bars.d.ts.map +1 -1
  13. package/lib/browser/shell/tab-bars.js +243 -8
  14. package/lib/browser/shell/tab-bars.js.map +1 -1
  15. package/lib/browser/shell/tab-bars.spec.js +382 -2
  16. package/lib/browser/shell/tab-bars.spec.js.map +1 -1
  17. package/lib/browser/widgets/widget.d.ts.map +1 -1
  18. package/lib/browser/widgets/widget.js +34 -1
  19. package/lib/browser/widgets/widget.js.map +1 -1
  20. package/lib/common/char-code.d.ts +7 -3
  21. package/lib/common/char-code.d.ts.map +1 -1
  22. package/lib/common/char-code.js +408 -1
  23. package/lib/common/char-code.js.map +1 -1
  24. package/lib/common/core-preferences.d.ts +1 -0
  25. package/lib/common/core-preferences.d.ts.map +1 -1
  26. package/lib/common/core-preferences.js +10 -0
  27. package/lib/common/core-preferences.js.map +1 -1
  28. package/lib/common/glob.js +2 -1
  29. package/lib/common/glob.js.map +1 -1
  30. package/lib/common/message-rpc/rpc-message-encoder.d.ts +1 -1
  31. package/lib/common/message-rpc/rpc-message-encoder.d.ts.map +1 -1
  32. package/lib/common/message-rpc/rpc-message-encoder.js +13 -5
  33. package/lib/common/message-rpc/rpc-message-encoder.js.map +1 -1
  34. package/lib/common/message-rpc/rpc-protocol.js +6 -6
  35. package/lib/common/message-rpc/rpc-protocol.js.map +1 -1
  36. package/lib/common/messaging/socket-write-buffer.d.ts +8 -2
  37. package/lib/common/messaging/socket-write-buffer.d.ts.map +1 -1
  38. package/lib/common/messaging/socket-write-buffer.js +18 -12
  39. package/lib/common/messaging/socket-write-buffer.js.map +1 -1
  40. package/lib/common/messaging/socket-write-buffer.spec.d.ts +2 -0
  41. package/lib/common/messaging/socket-write-buffer.spec.d.ts.map +1 -0
  42. package/lib/common/messaging/socket-write-buffer.spec.js +72 -0
  43. package/lib/common/messaging/socket-write-buffer.spec.js.map +1 -0
  44. package/lib/common/observable/autorun.d.ts +1 -1
  45. package/lib/common/observable/autorun.d.ts.map +1 -1
  46. package/lib/common/observable/autorun.js +27 -12
  47. package/lib/common/observable/autorun.js.map +1 -1
  48. package/lib/common/observable/derived-observable.d.ts +1 -1
  49. package/lib/common/observable/derived-observable.d.ts.map +1 -1
  50. package/lib/common/observable/derived-observable.js +36 -17
  51. package/lib/common/observable/derived-observable.js.map +1 -1
  52. package/lib/common/paths.js +12 -11
  53. package/lib/common/paths.js.map +1 -1
  54. package/lib/common/shell-quoting.d.ts +1 -1
  55. package/lib/common/shell-quoting.d.ts.map +1 -1
  56. package/lib/common/shell-quoting.js +34 -0
  57. package/lib/common/shell-quoting.js.map +1 -1
  58. package/lib/common/shell-quoting.spec.js +10 -10
  59. package/lib/common/shell-quoting.spec.js.map +1 -1
  60. package/lib/common/strings.js +4 -2
  61. package/lib/common/strings.js.map +1 -1
  62. package/lib/common/ternary-search-tree.js +2 -1
  63. package/lib/common/ternary-search-tree.js.map +1 -1
  64. package/package.json +4 -4
  65. package/src/browser/saveable.ts +1 -1
  66. package/src/browser/shell/application-shell.ts +14 -1
  67. package/src/browser/shell/tab-bars.spec.ts +431 -2
  68. package/src/browser/shell/tab-bars.ts +261 -9
  69. package/src/browser/style/tabs.css +58 -3
  70. package/src/browser/widgets/widget.ts +36 -1
  71. package/src/common/char-code.ts +7 -3
  72. package/src/common/core-preferences.ts +11 -0
  73. package/src/common/message-rpc/rpc-message-encoder.ts +1 -1
  74. package/src/common/messaging/socket-write-buffer.spec.ts +90 -0
  75. package/src/common/messaging/socket-write-buffer.ts +18 -14
  76. package/src/common/observable/autorun.ts +1 -1
  77. package/src/common/observable/derived-observable.ts +1 -1
  78. package/src/common/shell-quoting.ts +1 -1
@@ -17,6 +17,8 @@
17
17
  * Copyright (c) Microsoft Corporation. All rights reserved.
18
18
  * Licensed under the MIT License. See License.txt in the project root for license information.
19
19
  *--------------------------------------------------------------------------------------------*/
20
+ // based on https://github.com/microsoft/vscode/blob/04c36be045a94fee58e5f8992d3e3fd980294a84/src/vs/base/common/strings.ts
21
+ import { CharCode } from './char-code.js';
20
22
  /**
21
23
  * Determines if haystack ends with needle.
22
24
  */
@@ -33,10 +35,10 @@ export function endsWith(haystack, needle) {
33
35
  }
34
36
  }
35
37
  export function isLowerAsciiLetter(code) {
36
- return code >= 97 /* CharCode.a */ && code <= 122 /* CharCode.z */;
38
+ return code >= CharCode.a && code <= CharCode.z;
37
39
  }
38
40
  export function isUpperAsciiLetter(code) {
39
- return code >= 65 /* CharCode.A */ && code <= 90 /* CharCode.Z */;
41
+ return code >= CharCode.A && code <= CharCode.Z;
40
42
  }
41
43
  function isAsciiLetter(code) {
42
44
  return isLowerAsciiLetter(code) || isUpperAsciiLetter(code);
@@ -1 +1 @@
1
- {"version":3,"file":"strings.js","sourceRoot":"","sources":["../../src/common/strings.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"strings.js","sourceRoot":"","sources":["../../src/common/strings.ts"],"names":[],"mappings":"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"}
@@ -17,6 +17,7 @@
17
17
  * Copyright (c) Microsoft Corporation. All rights reserved.
18
18
  * Licensed under the MIT License. See License.txt in the project root for license information.
19
19
  *--------------------------------------------------------------------------------------------*/
20
+ import { CharCode } from './char-code.js';
20
21
  import { compareSubstringIgnoreCase, compare, compareSubstring } from './strings.js';
21
22
  export class PathIterator {
22
23
  constructor(_splitOnBackslash = true, _caseSensitive = true) {
@@ -38,7 +39,7 @@ export class PathIterator {
38
39
  let justSeps = true;
39
40
  for (; this._to < this._value.length; this._to++) {
40
41
  const ch = this._value.charCodeAt(this._to);
41
- if (ch === 47 /* CharCode.Slash */ || this._splitOnBackslash && ch === 92 /* CharCode.Backslash */) {
42
+ if (ch === CharCode.Slash || this._splitOnBackslash && ch === CharCode.Backslash) {
42
43
  if (justSeps) {
43
44
  this._from++;
44
45
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ternary-search-tree.js","sourceRoot":"","sources":["../../src/common/ternary-search-tree.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ternary-search-tree.js","sourceRoot":"","sources":["../../src/common/ternary-search-tree.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF;;;gGAGgG;AAQhG,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,0BAA0B,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAYrF,MAAM,OAAO,YAAY;IAMrB,YACqB,oBAA6B,IAAI,EACjC,iBAA0B,IAAI;QAD9B,sBAAiB,GAAjB,iBAAiB,CAAgB;QACjC,mBAAc,GAAd,cAAc,CAAgB;IAC/C,CAAC;IAEL,KAAK,CAAC,GAAW;QACb,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;QACb,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IACzC,CAAC;IAED,IAAI;QACA,oDAAoD;QACpD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC;QACtB,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAC/C,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC5C,IAAI,EAAE,KAAK,QAAQ,CAAC,KAAK,IAAI,IAAI,CAAC,iBAAiB,IAAI,EAAE,KAAK,QAAQ,CAAC,SAAS,EAAE,CAAC;gBAC/E,IAAI,QAAQ,EAAE,CAAC;oBACX,IAAI,CAAC,KAAK,EAAE,CAAC;gBACjB,CAAC;qBAAM,CAAC;oBACJ,MAAM;gBACV,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,QAAQ,GAAG,KAAK,CAAC;YACrB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,GAAG,CAAC,CAAS;QACT,OAAO,IAAI,CAAC,cAAc;YACtB,CAAC,CAAC,gBAAgB,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC;YACrE,CAAC,CAAC,0BAA0B,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACxF,CAAC;IAED,KAAK;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;CACJ;AAMD,MAAM,OAAO,WAAW;IAOpB,YACuB,aAAsB;QAAtB,kBAAa,GAAb,aAAa,CAAS;QAJrC,YAAO,GAAuB,EAAE,CAAC;QACjC,cAAS,GAAW,CAAC,CAAC;IAI1B,CAAC;IAEL,KAAK,CAAC,GAAQ;QACV,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACrB,IAAI,CAAC,OAAO,CAAC,IAAI,iCAAyB,CAAC;QAC/C,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,IAAI,oCAA4B,CAAC;QAClD,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACnB,IAAI,CAAC,aAAa,GAAG,IAAI,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YACjE,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC9C,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,EAAE,CAAC;gBAC7B,IAAI,CAAC,OAAO,CAAC,IAAI,+BAAuB,CAAC;YAC7C,CAAC;QACL,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,IAAI,gCAAwB,CAAC;QAC9C,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACvB,IAAI,CAAC,OAAO,CAAC,IAAI,mCAA2B,CAAC;QACjD,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QACnB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI;QACA,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,kCAA0B,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;YACzF,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;QAC9B,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC;QACxB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO;QACH,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,kCAA0B,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;eACxF,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IACpD,CAAC;IAED,GAAG,CAAC,CAAS;QACT,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,oCAA4B,EAAE,CAAC;YAC3D,OAAO,0BAA0B,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7D,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,uCAA+B,EAAE,CAAC;YACrE,OAAO,0BAA0B,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAChE,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,kCAA0B,EAAE,CAAC;YAChE,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,mCAA2B,EAAE,CAAC;YACjE,OAAO,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,sCAA8B,EAAE,CAAC;YACpE,OAAO,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,IAAI,KAAK,EAAE,CAAC;IACtB,CAAC;IAED,KAAK;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,oCAA4B,EAAE,CAAC;YAC3D,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAC9B,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,uCAA+B,EAAE,CAAC;YACrE,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;QACjC,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,kCAA0B,EAAE,CAAC;YAChE,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QACtC,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,mCAA2B,EAAE,CAAC;YACjE,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QAC7B,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,sCAA8B,EAAE,CAAC;YACpE,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChC,CAAC;QACD,MAAM,IAAI,KAAK,EAAE,CAAC;IACtB,CAAC;CACJ;AAED,MAAM,qBAAqB;IAQvB,OAAO;QACH,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;IACjE,CAAC;CACJ;AAED,MAAM,OAAO,mBAAmB;IAAhC;QAEY,WAAM,GAAW,CAAC,CAAC;IAyB/B,CAAC;IAvBG,KAAK,CAAC,GAAgB;QAClB,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI;QACA,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAChD,CAAC;IAED,GAAG,CAAC,CAAS;QACT,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;QACjE,OAAO,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;IAC5D,CAAC;CACJ;AAED,MAAM,OAAO,iBAAiB;IAE1B,MAAM,CAAC,OAAO,CAAI,aAAsB;QACpC,OAAO,IAAI,iBAAiB,CAAS,IAAI,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,CAAC,QAAQ;QACX,OAAO,IAAI,iBAAiB,CAAY,IAAI,YAAY,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,CAAC,eAAe;QAClB,OAAO,IAAI,iBAAiB,CAAiB,IAAI,mBAAmB,EAAE,CAAC,CAAC;IAC5E,CAAC;IAKD,YAAY,QAAyB;QACjC,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED,KAAK;QACD,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;IAC3B,CAAC;IAED,GAAG,CAAC,GAAM,EAAE,OAAU;QAClB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,IAAiC,CAAC;QAEtC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACd,IAAI,CAAC,KAAK,GAAG,IAAI,qBAAqB,EAAQ,CAAC;YAC/C,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QACtC,CAAC;QAED,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QAClB,OAAO,IAAI,EAAE,CAAC;YACV,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;gBACV,OAAO;gBACP,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;oBACb,IAAI,CAAC,IAAI,GAAG,IAAI,qBAAqB,EAAQ,CAAC;oBAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;gBACrC,CAAC;gBACD,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YAErB,CAAC;iBAAM,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;gBACjB,QAAQ;gBACR,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACd,IAAI,CAAC,KAAK,GAAG,IAAI,qBAAqB,EAAQ,CAAC;oBAC/C,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;gBACtC,CAAC;gBACD,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;YAEtB,CAAC;iBAAM,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxB,MAAM;gBACN,IAAI,CAAC,IAAI,EAAE,CAAC;gBACZ,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;oBACZ,IAAI,CAAC,GAAG,GAAG,IAAI,qBAAqB,EAAQ,CAAC;oBAC7C,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpC,CAAC;gBACD,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACJ,MAAM;YACV,CAAC;QACL,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,GAAG,CAAC,GAAM;QACN,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACtB,OAAO,IAAI,EAAE,CAAC;YACV,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;gBACV,OAAO;gBACP,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACrB,CAAC;iBAAM,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;gBACjB,QAAQ;gBACR,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;YACtB,CAAC;iBAAM,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxB,MAAM;gBACN,IAAI,CAAC,IAAI,EAAE,CAAC;gBACZ,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACJ,MAAM;YACV,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,GAAM;QAET,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,KAAK,GAAgD,EAAE,CAAC;QAC9D,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QAEtB,sBAAsB;QACtB,OAAO,IAAI,EAAE,CAAC;YACV,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;gBACV,OAAO;gBACP,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBACtB,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACrB,CAAC;iBAAM,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;gBACjB,QAAQ;gBACR,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBACvB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;YACtB,CAAC;iBAAM,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxB,MAAM;gBACN,IAAI,CAAC,IAAI,EAAE,CAAC;gBACZ,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBACtB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACJ,iBAAiB;gBACjB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;gBAEvB,uBAAuB;gBACvB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;oBACxC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;oBACnC,QAAQ,GAAG,EAAE,CAAC;wBACV,KAAK,CAAC;4BAAE,MAAM,CAAC,IAAI,GAAG,SAAS,CAAC;4BAAC,MAAM;wBACvC,KAAK,CAAC;4BAAE,MAAM,CAAC,GAAG,GAAG,SAAS,CAAC;4BAAC,MAAM;wBACtC,KAAK,CAAC,CAAC;4BAAE,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC;4BAAC,MAAM;oBAC7C,CAAC;oBACD,IAAI,GAAG,MAAM,CAAC;gBAClB,CAAC;gBACD,MAAM;YACV,CAAC;QACL,CAAC;IACL,CAAC;IAED,UAAU,CAAC,GAAM;QACb,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACtB,IAAI,SAAS,GAAkB,SAAS,CAAC;QACzC,OAAO,IAAI,EAAE,CAAC;YACV,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;gBACV,OAAO;gBACP,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACrB,CAAC;iBAAM,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;gBACjB,QAAQ;gBACR,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;YACtB,CAAC;iBAAM,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxB,MAAM;gBACN,IAAI,CAAC,IAAI,EAAE,CAAC;gBACZ,SAAS,GAAG,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC;gBACpC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACJ,MAAM;YACV,CAAC;QACL,CAAC;QACD,OAAO,IAAI,IAAI,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC;IAC3C,CAAC;IAED,YAAY,CAAC,GAAM;QACf,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACtB,OAAO,IAAI,EAAE,CAAC;YACV,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;gBACV,OAAO;gBACP,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACrB,CAAC;iBAAM,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;gBACjB,QAAQ;gBACR,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;YACtB,CAAC;iBAAM,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxB,MAAM;gBACN,IAAI,CAAC,IAAI,EAAE,CAAC;gBACZ,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACJ,UAAU;gBACV,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;oBACZ,OAAO,SAAS,CAAC;gBACrB,CAAC;qBAAM,CAAC;oBACJ,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACxC,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEO,aAAa,CAAC,IAAiC;QACnD,IAAI,GAA+B,CAAC;QACpC,IAAI,GAAW,CAAC;QAChB,IAAI,IAAS,CAAC;QACd,MAAM,IAAI,GAAG,GAAsB,EAAE;YACjC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,6BAA6B;gBAC7B,IAAI,GAAG,EAAE,CAAC;gBACV,GAAG,GAAG,CAAC,CAAC;gBACR,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACnD,CAAC;YACD,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBACrB,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;YAC5C,CAAC;YAED,IAAI,CAAC,GAAG,EAAE,CAAC;gBACP,GAAG,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACJ,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAC5B,CAAC;YACD,OAAO,GAAG,CAAC;QACf,CAAC,CAAC;QACF,OAAO,EAAE,IAAI,EAAE,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,QAAqC;QACzC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACxC,CAAC;IAEO,QAAQ,CAAC,IAA6C,EAAE,QAAqC;QACjG,IAAI,IAAI,EAAE,CAAC;YACP,OAAO;YACP,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEnC,OAAO;YACP,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACb,gDAAgD;gBAChD,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YACnC,CAAC;YACD,MAAM;YACN,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAElC,QAAQ;YACR,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxC,CAAC;IACL,CAAC;CACJ"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@theia/core",
3
- "version": "1.78.0-next.19+437666ef7",
3
+ "version": "1.78.0-next.28+abcc8ee5d",
4
4
  "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
5
5
  "type": "module",
6
6
  "main": "lib/common/index.js",
@@ -63,8 +63,8 @@
63
63
  "@lumino/virtualdom": "^2.0.5",
64
64
  "@lumino/widgets": "2.7.5",
65
65
  "@parcel/watcher": "^2.6.0",
66
- "@theia/application-package": "1.78.0-next.19+437666ef7",
67
- "@theia/request": "1.78.0-next.19+437666ef7",
66
+ "@theia/application-package": "1.78.0-next.28+abcc8ee5d",
67
+ "@theia/request": "1.78.0-next.28+abcc8ee5d",
68
68
  "@types/body-parser": "^1.19.6",
69
69
  "@types/express": "^4.17.25",
70
70
  "@types/fs-extra": "^4.0.15",
@@ -282,5 +282,5 @@
282
282
  "nyc": {
283
283
  "extends": "../../configs/nyc.json"
284
284
  },
285
- "gitHead": "437666ef7a6573ee8e5f41e3206c8be4d7e83ab4"
285
+ "gitHead": "abcc8ee5d8dc818f032b651e6b65f2e716e9fe70"
286
286
  }
@@ -317,7 +317,7 @@ export namespace SaveableWidget {
317
317
  /**
318
318
  * Possible formatting types when saving.
319
319
  */
320
- export const enum FormatType {
320
+ export enum FormatType {
321
321
  /**
322
322
  * Formatting should occur (default).
323
323
  */
@@ -114,11 +114,20 @@ export class DockPanelRenderer implements DockLayout.IRenderer {
114
114
  }
115
115
 
116
116
  createTabBar(): TabBar<Widget> {
117
+ const getPinnedTabSizingMode = (): ScrollableTabBar.PinnedTabSizingMode =>
118
+ this.corePreferences.get('workbench.editor.pinnedTabSizing') ?? 'normal';
119
+ const getPinnedTabSize = (): number | undefined => {
120
+ switch (getPinnedTabSizingMode()) {
121
+ case 'shrink': return ScrollableTabBar.DEFAULT_PINNED_TAB_SIZE;
122
+ default: return undefined;
123
+ }
124
+ };
117
125
  const getDynamicTabOptions: () => ScrollableTabBar.Options | undefined = () => {
118
126
  if (this.corePreferences.get('workbench.tab.shrinkToFit.enabled')) {
119
127
  return {
120
128
  minimumTabSize: this.corePreferences.get('workbench.tab.shrinkToFit.minimumSize'),
121
- defaultTabSize: this.corePreferences.get('workbench.tab.shrinkToFit.defaultSize')
129
+ defaultTabSize: this.corePreferences.get('workbench.tab.shrinkToFit.defaultSize'),
130
+ pinnedTabSize: getPinnedTabSize()
122
131
  };
123
132
  } else {
124
133
  return undefined;
@@ -147,12 +156,16 @@ export class DockPanelRenderer implements DockLayout.IRenderer {
147
156
  tabBar.nativeTabDragService = this.nativeTabDragService;
148
157
  renderer.contextMenuPath = SHELL_TABBAR_CONTEXT_MENU;
149
158
  tabBar.currentChanged.connect(this.onCurrentTabChanged, this);
159
+ tabBar.pinnedTabSizingMode = getPinnedTabSizingMode();
150
160
  const prefChangeDisposable = this.corePreferences.onPreferenceChanged(change => {
151
161
  if (change.preferenceName === 'workbench.tab.shrinkToFit.enabled' ||
152
162
  change.preferenceName === 'workbench.tab.shrinkToFit.minimumSize' ||
153
163
  change.preferenceName === 'workbench.tab.shrinkToFit.defaultSize') {
154
164
  tabBar.dynamicTabOptions = getDynamicTabOptions();
155
165
  }
166
+ if (change.preferenceName === 'workbench.editor.pinnedTabSizing') {
167
+ tabBar.updateTabOptions(getDynamicTabOptions(), getPinnedTabSizingMode());
168
+ }
156
169
  });
157
170
  tabBar.disposed.connect(() => {
158
171
  prefChangeDisposable.dispose();
@@ -17,15 +17,19 @@
17
17
  import { enableJSDOM } from '../test/jsdom.js';
18
18
  let disableJSDOM = enableJSDOM();
19
19
  import { expect } from 'chai';
20
+ import * as sinon from 'sinon';
20
21
 
21
22
  import { MessageLoop } from '@lumino/messaging';
23
+ import { Signal } from '@lumino/signaling';
22
24
  import { VirtualDOM } from '@lumino/virtualdom';
23
25
  import { TabBar, Title, Widget } from '@lumino/widgets';
24
26
  import { BreadcrumbsRenderer } from '../breadcrumbs/breadcrumbs-renderer.js';
25
27
  import { NativeTabDragService } from './native-tab-drag-service.js';
26
28
  import { TabBarToolbar, TabBarToolbarRegistry } from './tab-bar-toolbar/index.js';
27
- import { SideTabBar, TabBarRenderer, ToolbarAwareTabBar } from './tab-bars.js';
28
- import { pin } from '../widgets/widget.js';
29
+ import { ScrollableTabBar, SideTabBar, TabBarRenderer, ToolbarAwareTabBar } from './tab-bars.js';
30
+ import { isPinned, pin, PINNED_CLASS } from '../widgets/widget.js';
31
+ import { Disposable } from '../../common/index.js';
32
+ import { CorePreferences } from '../../common/core-preferences.js';
29
33
 
30
34
  disableJSDOM();
31
35
 
@@ -232,3 +236,428 @@ describe('tab bar', () => {
232
236
  });
233
237
  });
234
238
  });
239
+
240
+ describe('ScrollableTabBar pinned tabs', () => {
241
+
242
+ before(() => {
243
+ disableJSDOM = enableJSDOM();
244
+ });
245
+
246
+ after(() => {
247
+ disableJSDOM();
248
+ });
249
+
250
+ const createTitle = (label: string, pinned = false): Title<Widget> => new Title<Widget>({
251
+ owner: new Widget(),
252
+ label,
253
+ closable: !pinned,
254
+ className: pinned ? PINNED_CLASS : ''
255
+ });
256
+
257
+ const createTabBar = (): ScrollableTabBar => {
258
+ const tabBar = new ScrollableTabBar();
259
+ tabBar.pinnedTabSizingMode = 'shrink';
260
+ return tabBar;
261
+ };
262
+
263
+ const labels = (tabBar: ScrollableTabBar): string[] => tabBar.titles.map(title => title.label);
264
+
265
+ it('keeps an unpinned tab from being inserted within the pinned tabs', () => {
266
+ const tabBar = createTabBar();
267
+ tabBar.insertTab(0, createTitle('p1', true));
268
+ tabBar.insertTab(1, createTitle('p2', true));
269
+ tabBar.insertTab(2, createTitle('u1'));
270
+ // simulate dropping an unpinned tab in the middle of the pinned tabs
271
+ tabBar.insertTab(1, createTitle('u2'));
272
+ expect(labels(tabBar)).to.deep.equal(['p1', 'p2', 'u2', 'u1']);
273
+ });
274
+
275
+ it('keeps a pinned tab from being moved after unpinned tabs', () => {
276
+ const tabBar = createTabBar();
277
+ const p1 = createTitle('p1', true);
278
+ tabBar.insertTab(0, p1);
279
+ tabBar.insertTab(1, createTitle('p2', true));
280
+ tabBar.insertTab(2, createTitle('u1'));
281
+ // simulate dragging a pinned tab to the end of the tab bar
282
+ tabBar.insertTab(3, p1);
283
+ expect(labels(tabBar)).to.deep.equal(['p2', 'p1', 'u1']);
284
+ });
285
+
286
+ it('inserts a pinned tab within the pinned group', () => {
287
+ const tabBar = createTabBar();
288
+ tabBar.insertTab(0, createTitle('p1', true));
289
+ tabBar.insertTab(1, createTitle('u1'));
290
+ tabBar.insertTab(2, createTitle('p2', true));
291
+ expect(labels(tabBar)).to.deep.equal(['p1', 'p2', 'u1']);
292
+ });
293
+
294
+ it('keeps a newly pinned tab at the end of the pinned group', () => {
295
+ const tabBar = createTabBar();
296
+ const u1 = createTitle('u1');
297
+ tabBar.insertTab(0, createTitle('p1', true));
298
+ tabBar.insertTab(1, u1);
299
+ tabBar.insertTab(2, createTitle('u2'));
300
+ // simulate pinning the tab right after the pinned group: the tab bar moves it
301
+ // to the index of the first unpinned title
302
+ u1.closable = false;
303
+ u1.className = PINNED_CLASS;
304
+ tabBar.insertTab(tabBar.titles.findIndex(title => !isPinned(title)), u1);
305
+ expect(labels(tabBar)).to.deep.equal(['p1', 'u1', 'u2']);
306
+ });
307
+
308
+ it('moves pinned tabs to the start when shrink mode is enabled', () => {
309
+ const tabBar = new ScrollableTabBar();
310
+ tabBar.insertTab(0, createTitle('u1'));
311
+ tabBar.insertTab(1, createTitle('p1', true));
312
+ tabBar.insertTab(2, createTitle('u2'));
313
+ tabBar.insertTab(3, createTitle('p2', true));
314
+ expect(labels(tabBar)).to.deep.equal(['u1', 'p1', 'u2', 'p2']);
315
+ tabBar.pinnedTabSizingMode = 'shrink';
316
+ expect(labels(tabBar)).to.deep.equal(['p1', 'p2', 'u1', 'u2']);
317
+ });
318
+
319
+ it('does not reorder tabs when shrink mode is disabled', () => {
320
+ const tabBar = new ScrollableTabBar();
321
+ tabBar.insertTab(0, createTitle('p1', true));
322
+ tabBar.insertTab(1, createTitle('u1'));
323
+ tabBar.insertTab(0, createTitle('u2'));
324
+ expect(labels(tabBar)).to.deep.equal(['u2', 'p1', 'u1']);
325
+ });
326
+
327
+ const createRenderedTabBar = (): ScrollableTabBar => {
328
+ // A minimal preferences stub so that the renderer registers disposables,
329
+ // like the injected renderer in the application does.
330
+ const preferences = {
331
+ onPreferenceChanged: () => Disposable.create(() => { }),
332
+ get: () => undefined
333
+ } as unknown as CorePreferences;
334
+ const renderer = new TabBarRenderer(undefined, undefined, undefined, undefined, undefined, preferences);
335
+ const tabBar = new ScrollableTabBar({ renderer });
336
+ renderer.tabBar = tabBar;
337
+ return tabBar;
338
+ };
339
+
340
+ it('assigns increasing sticky offsets to pinned tabs so that they stack instead of overlapping', () => {
341
+ const tabBar = createRenderedTabBar();
342
+ tabBar.insertTab(0, createTitle('p1', true));
343
+ tabBar.insertTab(1, createTitle('p2', true));
344
+ tabBar.insertTab(2, createTitle('p3', true));
345
+ tabBar.insertTab(3, createTitle('u1'));
346
+ tabBar.pinnedTabSizingMode = 'shrink';
347
+ const tabs = Array.from(tabBar.contentNode.children) as HTMLElement[];
348
+ expect(tabs[0].style.getPropertyValue('--theia-pinned-tab-offset')).to.equal('0px');
349
+ expect(tabs[1].style.getPropertyValue('--theia-pinned-tab-offset')).to.equal('80px');
350
+ expect(tabs[2].style.getPropertyValue('--theia-pinned-tab-offset')).to.equal('160px');
351
+ expect(tabs[3].style.getPropertyValue('--theia-pinned-tab-offset')).to.equal('');
352
+ // the sticky offset must not be an inline `left` style: lumino positions
353
+ // the tabs with inline `left` styles while dragging
354
+ expect(tabs[0].style.left).to.equal('');
355
+ expect(tabs[1].style.left).to.equal('');
356
+ expect(tabs[2].style.left).to.equal('');
357
+ });
358
+
359
+ it('does not assign sticky offsets when shrink mode is disabled', () => {
360
+ const tabBar = createRenderedTabBar();
361
+ tabBar.insertTab(0, createTitle('p1', true));
362
+ tabBar.insertTab(1, createTitle('p2', true));
363
+ tabBar.pinnedTabSizingMode = 'normal';
364
+ const tabs = Array.from(tabBar.contentNode.children) as HTMLElement[];
365
+ expect(tabs[0].style.getPropertyValue('--theia-pinned-tab-offset')).to.equal('');
366
+ expect(tabs[1].style.getPropertyValue('--theia-pinned-tab-offset')).to.equal('');
367
+ });
368
+
369
+ it('stacks sticky pinned tabs above the current unpinned tab', () => {
370
+ const tabBar = createRenderedTabBar();
371
+ tabBar.insertTab(0, createTitle('p1', true));
372
+ tabBar.insertTab(1, createTitle('p2', true));
373
+ tabBar.insertTab(2, createTitle('u1'));
374
+ const u2 = createTitle('u2');
375
+ tabBar.insertTab(3, u2);
376
+ tabBar.pinnedTabSizingMode = 'shrink';
377
+ tabBar.currentTitle = u2;
378
+ MessageLoop.sendMessage(tabBar, Widget.Msg.UpdateRequest);
379
+ const tabs = Array.from(tabBar.contentNode.children) as HTMLElement[];
380
+ const zIndex = (index: number): number => Number(tabs[index].style.zIndex);
381
+ const n = tabBar.titles.length;
382
+ // the current tab keeps the highest z-index among the unpinned tabs ...
383
+ expect(zIndex(3)).to.equal(n);
384
+ // ... but the sticky pinned tabs stack above it, so that the current tab
385
+ // scrolled underneath them is painted below them
386
+ expect(zIndex(0)).to.be.greaterThan(n);
387
+ expect(zIndex(1)).to.be.greaterThan(n);
388
+ });
389
+
390
+ it('keeps the current tab above the pinned tabs when shrink mode is disabled', () => {
391
+ const tabBar = createRenderedTabBar();
392
+ tabBar.insertTab(0, createTitle('p1', true));
393
+ tabBar.insertTab(1, createTitle('u1'));
394
+ const u2 = createTitle('u2');
395
+ tabBar.insertTab(2, u2);
396
+ tabBar.pinnedTabSizingMode = 'normal';
397
+ tabBar.currentTitle = u2;
398
+ MessageLoop.sendMessage(tabBar, Widget.Msg.UpdateRequest);
399
+ const tabs = Array.from(tabBar.contentNode.children) as HTMLElement[];
400
+ const zIndex = (index: number): number => Number(tabs[index].style.zIndex);
401
+ const n = tabBar.titles.length;
402
+ expect(zIndex(2)).to.equal(n);
403
+ expect(zIndex(0)).to.be.lessThan(n);
404
+ });
405
+
406
+ // simulate a drag like lumino's pointer drag does: move the title directly, then emit `tabMoved`
407
+ const simulateDrag = (tabBar: ScrollableTabBar, title: Title<Widget>, fromIndex: number, toIndex: number): void => {
408
+ const titles = (tabBar as unknown as { _titles: Title<Widget>[] })._titles;
409
+ titles.splice(toIndex, 0, titles.splice(fromIndex, 1)[0]);
410
+ (tabBar.tabMoved as Signal<ScrollableTabBar, TabBar.ITabMovedArgs<Widget>>).emit({ fromIndex, toIndex, title });
411
+ };
412
+
413
+ // simulate a native drag like the dock panel does: `insertTab` (clamped to the group
414
+ // edge in shrink mode), then emit `tabMoved` with the index the tab was dropped at
415
+ const simulateNativeDrag = (tabBar: ScrollableTabBar, title: Title<Widget>, fromIndex: number, toIndex: number): void => {
416
+ tabBar.insertTab(toIndex, title);
417
+ (tabBar.tabMoved as Signal<ScrollableTabBar, TabBar.ITabMovedArgs<Widget>>).emit({ fromIndex, toIndex, title });
418
+ };
419
+
420
+ it('pins an unpinned tab dropped in front of the pinned tabs in shrink mode', () => {
421
+ const tabBar = createRenderedTabBar();
422
+ tabBar.insertTab(0, createTitle('p1', true));
423
+ tabBar.insertTab(1, createTitle('p2', true));
424
+ const u1 = createTitle('u1');
425
+ tabBar.insertTab(2, u1);
426
+ tabBar.pinnedTabSizingMode = 'shrink';
427
+ simulateDrag(tabBar, u1, 2, 0);
428
+ expect(isPinned(u1)).to.be.true;
429
+ expect(u1.closable).to.be.false;
430
+ expect(labels(tabBar)).to.deep.equal(['u1', 'p1', 'p2']);
431
+ });
432
+
433
+ it('pins an unpinned tab at the drop position within the pinned group', () => {
434
+ const tabBar = createRenderedTabBar();
435
+ tabBar.insertTab(0, createTitle('p1', true));
436
+ tabBar.insertTab(1, createTitle('p2', true));
437
+ tabBar.insertTab(2, createTitle('p3', true));
438
+ const u1 = createTitle('u1');
439
+ tabBar.insertTab(3, u1);
440
+ tabBar.pinnedTabSizingMode = 'shrink';
441
+ simulateNativeDrag(tabBar, u1, 3, 1); // dropped between p1 and p2
442
+ expect(isPinned(u1)).to.be.true;
443
+ expect(labels(tabBar)).to.deep.equal(['p1', 'u1', 'p2', 'p3']);
444
+ });
445
+
446
+ it('does not pin an unpinned tab dropped behind the pinned tabs in shrink mode', () => {
447
+ const tabBar = createRenderedTabBar();
448
+ tabBar.insertTab(0, createTitle('p1', true));
449
+ tabBar.insertTab(1, createTitle('p2', true));
450
+ tabBar.insertTab(2, createTitle('u1'));
451
+ const u2 = createTitle('u2');
452
+ tabBar.insertTab(3, u2);
453
+ tabBar.pinnedTabSizingMode = 'shrink';
454
+ simulateDrag(tabBar, u2, 3, 2); // right behind the pinned group
455
+ expect(isPinned(u2)).to.be.false;
456
+ });
457
+
458
+ it('pins an unpinned tab dropped in front of pinned tabs when shrink mode is disabled', () => {
459
+ const tabBar = createRenderedTabBar();
460
+ tabBar.insertTab(0, createTitle('p1', true));
461
+ const u1 = createTitle('u1');
462
+ tabBar.insertTab(1, u1);
463
+ tabBar.pinnedTabSizingMode = 'normal';
464
+ simulateDrag(tabBar, u1, 1, 0);
465
+ expect(isPinned(u1)).to.be.true;
466
+ expect(labels(tabBar)).to.deep.equal(['u1', 'p1']);
467
+ });
468
+
469
+ it('unpins a pinned tab dragged out of the pinned group in shrink mode', () => {
470
+ const tabBar = createRenderedTabBar();
471
+ const p1 = createTitle('p1', true);
472
+ tabBar.insertTab(0, p1);
473
+ tabBar.insertTab(1, createTitle('p2', true));
474
+ tabBar.insertTab(2, createTitle('u1'));
475
+ tabBar.pinnedTabSizingMode = 'shrink';
476
+ simulateDrag(tabBar, p1, 0, 2); // behind u1, outside the pinned group
477
+ expect(isPinned(p1)).to.be.false;
478
+ expect(p1.closable).to.be.true;
479
+ expect(labels(tabBar)).to.deep.equal(['p2', 'u1', 'p1']);
480
+ });
481
+
482
+ it('unpins a pinned tab at the drop position in the unpinned group', () => {
483
+ const tabBar = createRenderedTabBar();
484
+ const p1 = createTitle('p1', true);
485
+ tabBar.insertTab(0, p1);
486
+ tabBar.insertTab(1, createTitle('p2', true));
487
+ tabBar.insertTab(2, createTitle('u1'));
488
+ tabBar.insertTab(3, createTitle('u2'));
489
+ tabBar.pinnedTabSizingMode = 'shrink';
490
+ simulateNativeDrag(tabBar, p1, 0, 3); // dropped between u1 and u2
491
+ expect(isPinned(p1)).to.be.false;
492
+ expect(labels(tabBar)).to.deep.equal(['p2', 'u1', 'u2', 'p1']);
493
+ });
494
+
495
+ it('keeps a pinned tab pinned when it is dragged within the pinned group', () => {
496
+ const tabBar = createRenderedTabBar();
497
+ tabBar.insertTab(0, createTitle('p1', true));
498
+ const p2 = createTitle('p2', true);
499
+ tabBar.insertTab(1, p2);
500
+ tabBar.insertTab(2, createTitle('u1'));
501
+ tabBar.pinnedTabSizingMode = 'shrink';
502
+ simulateDrag(tabBar, p2, 1, 0);
503
+ expect(isPinned(p2)).to.be.true;
504
+ });
505
+
506
+ it('unpins a pinned tab dragged out of the pinned group when shrink mode is disabled', () => {
507
+ const tabBar = createRenderedTabBar();
508
+ const p1 = createTitle('p1', true);
509
+ tabBar.insertTab(0, p1);
510
+ tabBar.insertTab(1, createTitle('u1'));
511
+ tabBar.pinnedTabSizingMode = 'normal';
512
+ simulateDrag(tabBar, p1, 0, 1);
513
+ expect(isPinned(p1)).to.be.false;
514
+ expect(labels(tabBar)).to.deep.equal(['u1', 'p1']);
515
+ });
516
+
517
+ it('suspends pinned tab transitions only for the first frame of a drag', async () => {
518
+ // use sinon's fake timers so the test does not depend on the real timer resolution:
519
+ const clock = sinon.useFakeTimers();
520
+ try {
521
+ // jsdom has no requestAnimationFrame unless it is polyfilled
522
+ (window as unknown as { requestAnimationFrame?: unknown }).requestAnimationFrame ??=
523
+ (callback: FrameRequestCallback): number => setTimeout(() => callback(performance.now()), 0) as unknown as number;
524
+ const tabBar = createRenderedTabBar();
525
+ tabBar.pinnedTabSizingMode = 'shrink';
526
+ const suspend = (): void =>
527
+ (tabBar as unknown as { suspendPinnedTabTransitionsOnDragStart(): void }).suspendPinnedTabTransitionsOnDragStart();
528
+ suspend();
529
+ expect(tabBar.node.classList.contains('theia-pinned-tab-drag-start')).to.be.true;
530
+ // the class is removed again after the next frame, so that lumino's
531
+ // transition slides the pinned tabs for the rest of the drag; tick far enough
532
+ // to run both nested frames regardless of how many there are
533
+ await clock.tickAsync(100);
534
+ expect(tabBar.node.classList.contains('theia-pinned-tab-drag-start')).to.be.false;
535
+ } finally {
536
+ clock.restore();
537
+ }
538
+ });
539
+
540
+ describe('revealTab', () => {
541
+
542
+ // jsdom has no layout and no requestAnimationFrame: mock both
543
+ const setup = (): { tabBar: ScrollableTabBar, container: HTMLElement } => {
544
+ (window as unknown as { requestAnimationFrame?: unknown }).requestAnimationFrame ??=
545
+ (callback: FrameRequestCallback): number => setTimeout(() => callback(performance.now()), 0) as unknown as number;
546
+ const tabBar = createRenderedTabBar();
547
+ tabBar.insertTab(0, createTitle('p1', true));
548
+ tabBar.insertTab(1, createTitle('p2', true));
549
+ tabBar.insertTab(2, createTitle('u1'));
550
+ tabBar.insertTab(3, createTitle('u2'));
551
+ tabBar.pinnedTabSizingMode = 'shrink';
552
+ // revealTab only proceeds when the tab bar is visible; avoid attaching so that
553
+ // no scroll bar is created (perfect-scrollbar is not resolvable under Node)
554
+ Object.defineProperty(tabBar, 'isVisible', { value: true, configurable: true });
555
+ const container = tabBar.node.querySelector('.lm-TabBar-content-container') as HTMLElement;
556
+ const tabs = Array.from(tabBar.contentNode.children) as HTMLElement[];
557
+ const lefts = [0, 80, 160, 240];
558
+ tabs.forEach((tab, i) => {
559
+ Object.defineProperty(tab, 'offsetLeft', { value: lefts[i], configurable: true });
560
+ Object.defineProperty(tab, 'clientWidth', { value: 80, configurable: true });
561
+ });
562
+ Object.defineProperty(container, 'clientWidth', { value: 400, configurable: true });
563
+ return { tabBar, container };
564
+ };
565
+
566
+ it('reveals a tab scrolled off to the left to the right of the sticky pinned tabs', async () => {
567
+ const { tabBar, container } = setup();
568
+ container.scrollLeft = 300; // scrolled right, u1 (offsetLeft 160) off-screen left
569
+ await tabBar.revealTab(2);
570
+ // the pinned cluster is 2 * 80 = 160 wide, so u1 is revealed at scrollLeft 0
571
+ expect(container.scrollLeft).to.equal(0);
572
+ });
573
+
574
+ it('does not scroll when revealing a sticky pinned tab', async () => {
575
+ const { tabBar, container } = setup();
576
+ container.scrollLeft = 300;
577
+ await tabBar.revealTab(1); // p2: sticky pinned tabs are always visible
578
+ expect(container.scrollLeft).to.equal(300);
579
+ });
580
+ });
581
+
582
+ describe('updateTabs() dynamic tab sizing', () => {
583
+
584
+ // jsdom has no layout: mock the widths that updateTabs() reads
585
+ const setup = (pinned: number, unpinned: number, clientWidth: number,
586
+ tabOptions: ScrollableTabBar.Options = { minimumTabSize: 40, defaultTabSize: 200, pinnedTabSize: 80 },
587
+ openTabsWidth = 0): ScrollableTabBar => {
588
+ const tabBar = createRenderedTabBar();
589
+ for (let i = 0; i < pinned; i++) {
590
+ tabBar.insertTab(i, createTitle(`p${i}`, true));
591
+ }
592
+ for (let i = 0; i < unpinned; i++) {
593
+ tabBar.insertTab(pinned + i, createTitle(`u${i}`));
594
+ }
595
+ Object.defineProperty(tabBar.contentNode, 'clientWidth', { value: clientWidth, configurable: true });
596
+ const tabsButton = (tabBar as unknown as { openTabsContainer: HTMLDivElement }).openTabsContainer;
597
+ Object.defineProperty(tabsButton, 'getBoundingClientRect', { value: () => ({ width: openTabsWidth }), configurable: true });
598
+ // the setter triggers a synchronous updateTabs()
599
+ tabBar.dynamicTabOptions = tabOptions;
600
+ return tabBar;
601
+ };
602
+
603
+ const sizes = (tabBar: ScrollableTabBar): { tabSize: number, pinnedTabWidth: number } =>
604
+ tabBar as unknown as { tabSize: number, pinnedTabWidth: number };
605
+
606
+ const openTabsContainer = (tabBar: ScrollableTabBar): HTMLDivElement =>
607
+ (tabBar as unknown as { openTabsContainer: HTMLDivElement }).openTabsContainer;
608
+
609
+ it('splits the width remaining after the pinned tabs between the unpinned tabs', () => {
610
+ const tabBar = setup(2, 4, 600);
611
+ // the 2 pinned tabs take 160px, the remaining 440px are split between the 4 unpinned tabs
612
+ expect(sizes(tabBar).pinnedTabWidth).to.equal(80);
613
+ expect(sizes(tabBar).tabSize).to.equal(110);
614
+ const tabs = Array.from(tabBar.contentNode.children) as HTMLElement[];
615
+ expect(tabs[0].style.minWidth).to.equal('80px');
616
+ expect(tabs[1].style.minWidth).to.equal('80px');
617
+ expect(tabs[2].style.minWidth).to.equal('110px');
618
+ expect(tabs[5].style.minWidth).to.equal('110px');
619
+ });
620
+
621
+ it('clamps the unpinned tab size to the default tab size when there is enough room', () => {
622
+ const tabBar = setup(1, 1, 1000);
623
+ expect(sizes(tabBar).pinnedTabWidth).to.equal(80);
624
+ expect(sizes(tabBar).tabSize).to.equal(200);
625
+ });
626
+
627
+ it('clamps the unpinned tab size to the minimum tab size when space is tight', () => {
628
+ const tabBar = setup(2, 4, 300);
629
+ // 2 * 80 + 4 * 40 = 320 > 300, so the open tabs button stays visible and the
630
+ // 140px remaining after the pinned tabs cannot fit 4 tabs at a larger size
631
+ expect(openTabsContainer(tabBar).classList.contains('lm-mod-hidden')).to.be.false;
632
+ expect(sizes(tabBar).pinnedTabWidth).to.equal(80);
633
+ expect(sizes(tabBar).tabSize).to.equal(40);
634
+ });
635
+
636
+ it('uses the default tab size when all tabs are pinned', () => {
637
+ const tabBar = setup(3, 0, 500);
638
+ expect(sizes(tabBar).pinnedTabWidth).to.equal(80);
639
+ expect(sizes(tabBar).tabSize).to.equal(200);
640
+ });
641
+
642
+ it('shares the full width between all tabs when none are pinned', () => {
643
+ const tabBar = setup(0, 4, 600);
644
+ expect(sizes(tabBar).pinnedTabWidth).to.equal(0);
645
+ expect(sizes(tabBar).tabSize).to.equal(150);
646
+ });
647
+
648
+ it('ignores pinned tabs when no pinned tab size is configured', () => {
649
+ const tabBar = setup(2, 2, 600, { minimumTabSize: 40, defaultTabSize: 200 });
650
+ expect(sizes(tabBar).pinnedTabWidth).to.equal(0);
651
+ expect(sizes(tabBar).tabSize).to.equal(150);
652
+ });
653
+
654
+ it('reclaims the open tabs button width when the tabs fit without it', () => {
655
+ const tabBar = setup(1, 2, 200, { minimumTabSize: 40, defaultTabSize: 200, pinnedTabSize: 80 }, 100);
656
+ // the open tabs button (100px) is hidden and its width reclaimed:
657
+ // 200 + 100 - 80 = 220px are split between the 2 unpinned tabs
658
+ expect(openTabsContainer(tabBar).classList.contains('lm-mod-hidden')).to.be.true;
659
+ expect(sizes(tabBar).pinnedTabWidth).to.equal(80);
660
+ expect(sizes(tabBar).tabSize).to.equal(110);
661
+ });
662
+ });
663
+ });