@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.
- package/lib/browser/catalog.json +52 -0
- package/lib/browser/common-frontend-contribution.js +4 -4
- package/lib/browser/common-frontend-contribution.js.map +1 -1
- package/lib/browser/saveable.d.ts +1 -1
- package/lib/browser/saveable.d.ts.map +1 -1
- package/lib/browser/saveable.js +18 -0
- package/lib/browser/saveable.js.map +1 -1
- package/lib/browser/shell/application-shell.d.ts.map +1 -1
- package/lib/browser/shell/application-shell.js +13 -1
- package/lib/browser/shell/application-shell.js.map +1 -1
- package/lib/browser/shell/tab-bars.d.ts +71 -1
- package/lib/browser/shell/tab-bars.d.ts.map +1 -1
- package/lib/browser/shell/tab-bars.js +243 -8
- package/lib/browser/shell/tab-bars.js.map +1 -1
- package/lib/browser/shell/tab-bars.spec.js +382 -2
- package/lib/browser/shell/tab-bars.spec.js.map +1 -1
- package/lib/browser/widgets/widget.d.ts.map +1 -1
- package/lib/browser/widgets/widget.js +34 -1
- package/lib/browser/widgets/widget.js.map +1 -1
- package/lib/common/char-code.d.ts +7 -3
- package/lib/common/char-code.d.ts.map +1 -1
- package/lib/common/char-code.js +408 -1
- package/lib/common/char-code.js.map +1 -1
- package/lib/common/core-preferences.d.ts +1 -0
- package/lib/common/core-preferences.d.ts.map +1 -1
- package/lib/common/core-preferences.js +10 -0
- package/lib/common/core-preferences.js.map +1 -1
- package/lib/common/glob.js +2 -1
- package/lib/common/glob.js.map +1 -1
- package/lib/common/message-rpc/rpc-message-encoder.d.ts +1 -1
- package/lib/common/message-rpc/rpc-message-encoder.d.ts.map +1 -1
- package/lib/common/message-rpc/rpc-message-encoder.js +13 -5
- package/lib/common/message-rpc/rpc-message-encoder.js.map +1 -1
- package/lib/common/message-rpc/rpc-protocol.js +6 -6
- package/lib/common/message-rpc/rpc-protocol.js.map +1 -1
- package/lib/common/messaging/socket-write-buffer.d.ts +8 -2
- package/lib/common/messaging/socket-write-buffer.d.ts.map +1 -1
- package/lib/common/messaging/socket-write-buffer.js +18 -12
- package/lib/common/messaging/socket-write-buffer.js.map +1 -1
- package/lib/common/messaging/socket-write-buffer.spec.d.ts +2 -0
- package/lib/common/messaging/socket-write-buffer.spec.d.ts.map +1 -0
- package/lib/common/messaging/socket-write-buffer.spec.js +72 -0
- package/lib/common/messaging/socket-write-buffer.spec.js.map +1 -0
- package/lib/common/observable/autorun.d.ts +1 -1
- package/lib/common/observable/autorun.d.ts.map +1 -1
- package/lib/common/observable/autorun.js +27 -12
- package/lib/common/observable/autorun.js.map +1 -1
- package/lib/common/observable/derived-observable.d.ts +1 -1
- package/lib/common/observable/derived-observable.d.ts.map +1 -1
- package/lib/common/observable/derived-observable.js +36 -17
- package/lib/common/observable/derived-observable.js.map +1 -1
- package/lib/common/paths.js +12 -11
- package/lib/common/paths.js.map +1 -1
- package/lib/common/shell-quoting.d.ts +1 -1
- package/lib/common/shell-quoting.d.ts.map +1 -1
- package/lib/common/shell-quoting.js +34 -0
- package/lib/common/shell-quoting.js.map +1 -1
- package/lib/common/shell-quoting.spec.js +10 -10
- package/lib/common/shell-quoting.spec.js.map +1 -1
- package/lib/common/strings.js +4 -2
- package/lib/common/strings.js.map +1 -1
- package/lib/common/ternary-search-tree.js +2 -1
- package/lib/common/ternary-search-tree.js.map +1 -1
- package/package.json +4 -4
- package/src/browser/saveable.ts +1 -1
- package/src/browser/shell/application-shell.ts +14 -1
- package/src/browser/shell/tab-bars.spec.ts +431 -2
- package/src/browser/shell/tab-bars.ts +261 -9
- package/src/browser/style/tabs.css +58 -3
- package/src/browser/widgets/widget.ts +36 -1
- package/src/common/char-code.ts +7 -3
- package/src/common/core-preferences.ts +11 -0
- package/src/common/message-rpc/rpc-message-encoder.ts +1 -1
- package/src/common/messaging/socket-write-buffer.spec.ts +90 -0
- package/src/common/messaging/socket-write-buffer.ts +18 -14
- package/src/common/observable/autorun.ts +1 -1
- package/src/common/observable/derived-observable.ts +1 -1
- package/src/common/shell-quoting.ts +1 -1
|
@@ -22,7 +22,7 @@ import { Observable } from './observable-base.js';
|
|
|
22
22
|
export class Autorun {
|
|
23
23
|
constructor(doRun, options) {
|
|
24
24
|
this.doRun = doRun;
|
|
25
|
-
this.state =
|
|
25
|
+
this.state = Autorun.State.Stale;
|
|
26
26
|
this.updateCount = 0;
|
|
27
27
|
this.disposed = false;
|
|
28
28
|
this.isRunning = false;
|
|
@@ -55,7 +55,7 @@ export class Autorun {
|
|
|
55
55
|
}
|
|
56
56
|
this.dependenciesToBeRemoved = this.dependencies;
|
|
57
57
|
this.dependencies = new Set();
|
|
58
|
-
this.state =
|
|
58
|
+
this.state = Autorun.State.UpToDate;
|
|
59
59
|
try {
|
|
60
60
|
const { changeSummary } = this;
|
|
61
61
|
this.changeSummary = this.createChangeSummary?.();
|
|
@@ -92,8 +92,8 @@ export class Autorun {
|
|
|
92
92
|
createDependencyObserver() {
|
|
93
93
|
return {
|
|
94
94
|
beginUpdate: () => {
|
|
95
|
-
if (this.state ===
|
|
96
|
-
this.state =
|
|
95
|
+
if (this.state === Autorun.State.UpToDate) {
|
|
96
|
+
this.state = Autorun.State.DependenciesMightHaveChanged;
|
|
97
97
|
}
|
|
98
98
|
this.updateCount++;
|
|
99
99
|
},
|
|
@@ -101,17 +101,17 @@ export class Autorun {
|
|
|
101
101
|
this.updateCount--;
|
|
102
102
|
if (this.updateCount === 0) {
|
|
103
103
|
do {
|
|
104
|
-
if (this.state ===
|
|
105
|
-
this.state =
|
|
104
|
+
if (this.state === Autorun.State.DependenciesMightHaveChanged) {
|
|
105
|
+
this.state = Autorun.State.UpToDate;
|
|
106
106
|
for (const dependency of this.dependencies) {
|
|
107
107
|
dependency.update(); // might call handleChange indirectly, which could make us stale
|
|
108
|
-
if (this.state ===
|
|
108
|
+
if (this.state === Autorun.State.Stale) {
|
|
109
109
|
// The other dependencies will refresh on demand
|
|
110
110
|
break;
|
|
111
111
|
}
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
|
-
if (this.state !==
|
|
114
|
+
if (this.state !== Autorun.State.UpToDate) {
|
|
115
115
|
try {
|
|
116
116
|
this.run();
|
|
117
117
|
}
|
|
@@ -120,15 +120,15 @@ export class Autorun {
|
|
|
120
120
|
}
|
|
121
121
|
}
|
|
122
122
|
// In case the run action changed one of our dependencies, we need to run again.
|
|
123
|
-
} while (this.state !==
|
|
123
|
+
} while (this.state !== Autorun.State.UpToDate);
|
|
124
124
|
}
|
|
125
125
|
if (this.updateCount < 0) {
|
|
126
126
|
throw new Error('Unexpected update count: ' + this.updateCount);
|
|
127
127
|
}
|
|
128
128
|
},
|
|
129
129
|
handlePossibleChange: (observable) => {
|
|
130
|
-
if (this.state ===
|
|
131
|
-
this.state =
|
|
130
|
+
if (this.state === Autorun.State.UpToDate && this.dependencies.has(observable) && !this.dependenciesToBeRemoved?.has(observable)) {
|
|
131
|
+
this.state = Autorun.State.DependenciesMightHaveChanged;
|
|
132
132
|
}
|
|
133
133
|
},
|
|
134
134
|
handleChange: (observable, change) => {
|
|
@@ -147,7 +147,7 @@ export class Autorun {
|
|
|
147
147
|
}
|
|
148
148
|
}
|
|
149
149
|
if (shouldReact) {
|
|
150
|
-
this.state =
|
|
150
|
+
this.state = Autorun.State.Stale;
|
|
151
151
|
}
|
|
152
152
|
}
|
|
153
153
|
}
|
|
@@ -181,5 +181,20 @@ export class Autorun {
|
|
|
181
181
|
}
|
|
182
182
|
Autorun.create = create;
|
|
183
183
|
;
|
|
184
|
+
let State;
|
|
185
|
+
(function (State) {
|
|
186
|
+
/**
|
|
187
|
+
* Dependencies might have changed. Need to check if at least one dependency has actually changed.
|
|
188
|
+
*/
|
|
189
|
+
State[State["DependenciesMightHaveChanged"] = 0] = "DependenciesMightHaveChanged";
|
|
190
|
+
/**
|
|
191
|
+
* A dependency has changed. Need to (re-)run.
|
|
192
|
+
*/
|
|
193
|
+
State[State["Stale"] = 1] = "Stale";
|
|
194
|
+
/**
|
|
195
|
+
* All is up to date.
|
|
196
|
+
*/
|
|
197
|
+
State[State["UpToDate"] = 2] = "UpToDate";
|
|
198
|
+
})(State = Autorun.State || (Autorun.State = {}));
|
|
184
199
|
})(Autorun || (Autorun = {}));
|
|
185
200
|
//# sourceMappingURL=autorun.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autorun.js","sourceRoot":"","sources":["../../../src/common/observable/autorun.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,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;AAChG,4HAA4H;AAG5H,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,OAAO,OAAO;IAahB,YACuB,KAAmD,EACtE,OAAyC;QADtB,UAAK,GAAL,KAAK,CAA8C;QAZhE,UAAK
|
|
1
|
+
{"version":3,"file":"autorun.js","sourceRoot":"","sources":["../../../src/common/observable/autorun.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ export declare namespace DerivedObservable {
|
|
|
49
49
|
*/
|
|
50
50
|
willHandleChange?: <U, UChange>(context: Observable.ChangeContext<U, UChange>, changeSummary: TChangeSummary | undefined) => boolean;
|
|
51
51
|
}
|
|
52
|
-
|
|
52
|
+
enum State {
|
|
53
53
|
/**
|
|
54
54
|
* Initial state. No cached value.
|
|
55
55
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derived-observable.d.ts","sourceRoot":"","sources":["../../../src/common/observable/derived-observable.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElE;;;GAGG;AACH,qBAAa,iBAAiB,CAAC,CAAC,EAAE,cAAc,GAAG,OAAO,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;IAgB7E,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;IAdnF,SAAS,CAAC,KAAK,0BAAmC;IAClD,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACpB,SAAS,CAAC,WAAW,SAAK;IAC1B,SAAS,CAAC,WAAW,UAAS;IAC9B,SAAS,CAAC,YAAY,oCAAkC;IACxD,SAAS,CAAC,uBAAuB,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,SAAS,CAAC,iCAAiC,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACvE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,sBAAmC;IACxE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,cAAc,CAAC;IAC9D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,EAAE,cAAc,GAAG,SAAS,KAAK,OAAO,CAAC;IACxJ,SAAS,CAAC,aAAa,CAAC,EAAE,cAAc,CAAC;gBAGlB,OAAO,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAC/E,OAAO,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,EAAE,cAAc,CAAC;cASvC,qBAAqB,IAAI,IAAI;cAU7B,QAAQ,IAAI,CAAC;IA6ChC,SAAS,CAAC,SAAS,IAAI,IAAI;IAgC3B,SAAS,CAAC,eAAe,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC;IAe1D,SAAS,CAAC,wBAAwB,IAAI,UAAU,CAAC,QAAQ;IA0FhD,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,GAAG,IAAI;IAYhD,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,GAAG,IAAI;CAS/D;AAED,yBAAiB,iBAAiB,CAAC;IAE/B,SAAgB,MAAM,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,cAAc,CAAC,GAAG,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAE/I;IAED,UAAiB,IAAI,CAAC,cAAc;QAChC;;;;;WAKG;QACH,QAAQ,CAAC,aAAa,EAAE,cAAc,GAAG,SAAS,CAAC;KACtD;IAED,UAAiB,OAAO,CAAC,CAAC,EAAE,cAAc;QACtC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC;QAElC;;WAEG;QACH,mBAAmB,CAAC,EAAE,MAAM,cAAc,CAAC;QAE3C;;;WAGG;QACH,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,EAAE,cAAc,GAAG,SAAS,KAAK,OAAO,CAAC;KACxI;IAED,
|
|
1
|
+
{"version":3,"file":"derived-observable.d.ts","sourceRoot":"","sources":["../../../src/common/observable/derived-observable.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ export class DerivedObservable extends BaseObservable {
|
|
|
27
27
|
constructor(compute, options) {
|
|
28
28
|
super();
|
|
29
29
|
this.compute = compute;
|
|
30
|
-
this.state =
|
|
30
|
+
this.state = DerivedObservable.State.Initial;
|
|
31
31
|
this.updateCount = 0;
|
|
32
32
|
this.isComputing = false;
|
|
33
33
|
this.dependencies = new Set();
|
|
@@ -39,7 +39,7 @@ export class DerivedObservable extends BaseObservable {
|
|
|
39
39
|
}
|
|
40
40
|
onLastObserverRemoved() {
|
|
41
41
|
// We are not tracking changes anymore, thus we have to invalidate the cached value.
|
|
42
|
-
this.state =
|
|
42
|
+
this.state = DerivedObservable.State.Initial;
|
|
43
43
|
this.value = undefined;
|
|
44
44
|
for (const dependency of this.dependencies) {
|
|
45
45
|
dependency.removeObserver(this.dependencyObserver);
|
|
@@ -67,34 +67,34 @@ export class DerivedObservable extends BaseObservable {
|
|
|
67
67
|
}
|
|
68
68
|
else {
|
|
69
69
|
do {
|
|
70
|
-
if (this.state ===
|
|
70
|
+
if (this.state === DerivedObservable.State.DependenciesMightHaveChanged) {
|
|
71
71
|
// Need to ask our depedencies if at least one of them has actually changed.
|
|
72
72
|
for (const dependency of this.dependencies) {
|
|
73
73
|
dependency.update(); // might call handleChange indirectly, which could make us stale
|
|
74
|
-
if (this.state ===
|
|
74
|
+
if (this.state === DerivedObservable.State.Stale) {
|
|
75
75
|
// The other dependencies will refresh on demand, so early break
|
|
76
76
|
break;
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
80
|
// If we are still not stale, we can assume to be up to date again.
|
|
81
|
-
if (this.state ===
|
|
82
|
-
this.state =
|
|
81
|
+
if (this.state === DerivedObservable.State.DependenciesMightHaveChanged) {
|
|
82
|
+
this.state = DerivedObservable.State.UpToDate;
|
|
83
83
|
}
|
|
84
|
-
if (this.state !==
|
|
84
|
+
if (this.state !== DerivedObservable.State.UpToDate) {
|
|
85
85
|
this.recompute();
|
|
86
86
|
}
|
|
87
87
|
// In case recomputation changed one of our dependencies, we need to recompute again.
|
|
88
|
-
} while (this.state !==
|
|
88
|
+
} while (this.state !== DerivedObservable.State.UpToDate);
|
|
89
89
|
return this.value;
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
recompute() {
|
|
93
93
|
this.dependenciesToBeRemoved = this.dependencies;
|
|
94
94
|
this.dependencies = new Set();
|
|
95
|
-
const hadValue = this.state !==
|
|
95
|
+
const hadValue = this.state !== DerivedObservable.State.Initial;
|
|
96
96
|
const oldValue = this.value;
|
|
97
|
-
this.state =
|
|
97
|
+
this.state = DerivedObservable.State.UpToDate;
|
|
98
98
|
try {
|
|
99
99
|
const { changeSummary } = this;
|
|
100
100
|
this.changeSummary = this.createChangeSummary?.();
|
|
@@ -141,8 +141,8 @@ export class DerivedObservable extends BaseObservable {
|
|
|
141
141
|
try {
|
|
142
142
|
this.updateCount++;
|
|
143
143
|
const propagateBeginUpdate = this.updateCount === 1;
|
|
144
|
-
if (this.state ===
|
|
145
|
-
this.state =
|
|
144
|
+
if (this.state === DerivedObservable.State.UpToDate) {
|
|
145
|
+
this.state = DerivedObservable.State.DependenciesMightHaveChanged;
|
|
146
146
|
// If we propagate begin update, that will already signal a possible change.
|
|
147
147
|
if (!propagateBeginUpdate) {
|
|
148
148
|
for (const observer of this.observers) {
|
|
@@ -182,8 +182,8 @@ export class DerivedObservable extends BaseObservable {
|
|
|
182
182
|
},
|
|
183
183
|
handlePossibleChange: (observable) => {
|
|
184
184
|
// In all other states, observers already know that we might have changed.
|
|
185
|
-
if (this.state ===
|
|
186
|
-
this.state =
|
|
185
|
+
if (this.state === DerivedObservable.State.UpToDate && this.dependencies.has(observable) && !this.dependenciesToBeRemoved?.has(observable)) {
|
|
186
|
+
this.state = DerivedObservable.State.DependenciesMightHaveChanged;
|
|
187
187
|
for (const observer of this.observers) {
|
|
188
188
|
observer.handlePossibleChange(this);
|
|
189
189
|
}
|
|
@@ -204,9 +204,9 @@ export class DerivedObservable extends BaseObservable {
|
|
|
204
204
|
console.error(e);
|
|
205
205
|
}
|
|
206
206
|
}
|
|
207
|
-
const wasUpToDate = this.state ===
|
|
208
|
-
if (shouldReact && (this.state ===
|
|
209
|
-
this.state =
|
|
207
|
+
const wasUpToDate = this.state === DerivedObservable.State.UpToDate;
|
|
208
|
+
if (shouldReact && (this.state === DerivedObservable.State.DependenciesMightHaveChanged || wasUpToDate)) {
|
|
209
|
+
this.state = DerivedObservable.State.Stale;
|
|
210
210
|
if (wasUpToDate) {
|
|
211
211
|
for (const observer of this.observers) {
|
|
212
212
|
observer.handlePossibleChange(this);
|
|
@@ -244,5 +244,24 @@ export class DerivedObservable extends BaseObservable {
|
|
|
244
244
|
return new DerivedObservable(compute, options);
|
|
245
245
|
}
|
|
246
246
|
DerivedObservable.create = create;
|
|
247
|
+
let State;
|
|
248
|
+
(function (State) {
|
|
249
|
+
/**
|
|
250
|
+
* Initial state. No cached value.
|
|
251
|
+
*/
|
|
252
|
+
State[State["Initial"] = 0] = "Initial";
|
|
253
|
+
/**
|
|
254
|
+
* Dependencies might have changed. Need to check if at least one dependency has actually changed.
|
|
255
|
+
*/
|
|
256
|
+
State[State["DependenciesMightHaveChanged"] = 1] = "DependenciesMightHaveChanged";
|
|
257
|
+
/**
|
|
258
|
+
* A dependency has changed. Need to recompute the cached value.
|
|
259
|
+
*/
|
|
260
|
+
State[State["Stale"] = 2] = "Stale";
|
|
261
|
+
/**
|
|
262
|
+
* The cached value is up to date.
|
|
263
|
+
*/
|
|
264
|
+
State[State["UpToDate"] = 3] = "UpToDate";
|
|
265
|
+
})(State = DerivedObservable.State || (DerivedObservable.State = {}));
|
|
247
266
|
})(DerivedObservable || (DerivedObservable = {}));
|
|
248
267
|
//# sourceMappingURL=derived-observable.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derived-observable.js","sourceRoot":"","sources":["../../../src/common/observable/derived-observable.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,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;AAChG,4HAA4H;AAE5H,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElE;;;GAGG;AACH,MAAM,OAAO,iBAA+C,SAAQ,cAAiB;IAejF,YACuB,OAA4D,EAC/E,OAAsD;QAEtD,KAAK,EAAE,CAAC;QAHW,YAAO,GAAP,OAAO,CAAqD;QAdzE,UAAK,
|
|
1
|
+
{"version":3,"file":"derived-observable.js","sourceRoot":"","sources":["../../../src/common/observable/derived-observable.ts"],"names":[],"mappings":"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"}
|
package/lib/common/paths.js
CHANGED
|
@@ -23,6 +23,7 @@
|
|
|
23
23
|
'use strict';
|
|
24
24
|
import { isWindows } from './os.js';
|
|
25
25
|
import { startsWithIgnoreCase } from './strings.js';
|
|
26
|
+
import { CharCode } from './char-code.js';
|
|
26
27
|
/**
|
|
27
28
|
* The forward slash path separator.
|
|
28
29
|
*/
|
|
@@ -82,7 +83,7 @@ export function normalize(path, toOSPath) {
|
|
|
82
83
|
let res = '';
|
|
83
84
|
for (let end = root.length; end <= len; end++) {
|
|
84
85
|
// either at the end or at a path-separator character
|
|
85
|
-
if (end === len || path.charCodeAt(end) ===
|
|
86
|
+
if (end === len || path.charCodeAt(end) === CharCode.Slash || path.charCodeAt(end) === CharCode.Backslash) {
|
|
86
87
|
if (streql(path, start, end, '..')) {
|
|
87
88
|
// skip current and remove parent (if there is already something)
|
|
88
89
|
const prev_start = res.lastIndexOf(sep);
|
|
@@ -124,28 +125,28 @@ export function getRoot(path, sep = '/') {
|
|
|
124
125
|
}
|
|
125
126
|
const len = path.length;
|
|
126
127
|
let code = path.charCodeAt(0);
|
|
127
|
-
if (code ===
|
|
128
|
+
if (code === CharCode.Slash || code === CharCode.Backslash) {
|
|
128
129
|
code = path.charCodeAt(1);
|
|
129
|
-
if (code ===
|
|
130
|
+
if (code === CharCode.Slash || code === CharCode.Backslash) {
|
|
130
131
|
// UNC candidate \\localhost\shares\ddd
|
|
131
132
|
// ^^^^^^^^^^^^^^^^^^^
|
|
132
133
|
code = path.charCodeAt(2);
|
|
133
|
-
if (code !==
|
|
134
|
+
if (code !== CharCode.Slash && code !== CharCode.Backslash) {
|
|
134
135
|
// eslint-disable-next-line @typescript-eslint/no-shadow
|
|
135
136
|
let pos = 3;
|
|
136
137
|
const start = pos;
|
|
137
138
|
for (; pos < len; pos++) {
|
|
138
139
|
code = path.charCodeAt(pos);
|
|
139
|
-
if (code ===
|
|
140
|
+
if (code === CharCode.Slash || code === CharCode.Backslash) {
|
|
140
141
|
break;
|
|
141
142
|
}
|
|
142
143
|
}
|
|
143
144
|
code = path.charCodeAt(pos + 1);
|
|
144
|
-
if (start !== pos && code !==
|
|
145
|
+
if (start !== pos && code !== CharCode.Slash && code !== CharCode.Backslash) {
|
|
145
146
|
pos += 1;
|
|
146
147
|
for (; pos < len; pos++) {
|
|
147
148
|
code = path.charCodeAt(pos);
|
|
148
|
-
if (code ===
|
|
149
|
+
if (code === CharCode.Slash || code === CharCode.Backslash) {
|
|
149
150
|
return path.slice(0, pos + 1) // consume this separator
|
|
150
151
|
.replace(/[\\/]/g, sep);
|
|
151
152
|
}
|
|
@@ -157,11 +158,11 @@ export function getRoot(path, sep = '/') {
|
|
|
157
158
|
// ^
|
|
158
159
|
return sep;
|
|
159
160
|
}
|
|
160
|
-
else if ((code >=
|
|
161
|
+
else if ((code >= CharCode.A && code <= CharCode.Z) || (code >= CharCode.a && code <= CharCode.z)) {
|
|
161
162
|
// check for windows drive letter c:\ or c:
|
|
162
|
-
if (path.charCodeAt(1) ===
|
|
163
|
+
if (path.charCodeAt(1) === CharCode.Colon) {
|
|
163
164
|
code = path.charCodeAt(2);
|
|
164
|
-
if (code ===
|
|
165
|
+
if (code === CharCode.Slash || code === CharCode.Backslash) {
|
|
165
166
|
// C:\fff
|
|
166
167
|
// ^^^
|
|
167
168
|
return path.slice(0, 2) + sep;
|
|
@@ -181,7 +182,7 @@ export function getRoot(path, sep = '/') {
|
|
|
181
182
|
pos += 3; // 3 -> "://".length
|
|
182
183
|
for (; pos < len; pos++) {
|
|
183
184
|
code = path.charCodeAt(pos);
|
|
184
|
-
if (code ===
|
|
185
|
+
if (code === CharCode.Slash || code === CharCode.Backslash) {
|
|
185
186
|
return path.slice(0, pos + 1); // consume this separator
|
|
186
187
|
}
|
|
187
188
|
}
|
package/lib/common/paths.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/common/paths.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,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;AAEhF,4HAA4H;AAC5H;;;gGAGgG;AAChG,4BAA4B;AAC5B,oCAAoC;AACpC,YAAY,CAAC;AACb,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/common/paths.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Defines how an argument should be quoted if it contains
|
|
3
3
|
* spaces or unsupported characters.
|
|
4
4
|
*/
|
|
5
|
-
export declare
|
|
5
|
+
export declare enum ShellQuoting {
|
|
6
6
|
/**
|
|
7
7
|
* Character escaping should be used. This for example
|
|
8
8
|
* uses \ on bash and ` on PowerShell.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-quoting.d.ts","sourceRoot":"","sources":["../../src/common/shell-quoting.ts"],"names":[],"mappings":"AAyBA;;;GAGG;AACH,
|
|
1
|
+
{"version":3,"file":"shell-quoting.d.ts","sourceRoot":"","sources":["../../src/common/shell-quoting.ts"],"names":[],"mappings":"AAyBA;;;GAGG;AACH,oBAAY,YAAY;IAEpB;;;OAGG;IACH,MAAM,WAAW;IAEjB;;;;;;OAMG;IACH,MAAM,WAAW;IAEjB;;;;;;OAMG;IACH,IAAI,SAAS;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;CACzB;AAID;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAElC,UAAU,EAAE;QACR,qEAAqE;QACrE,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,8CAA8C;QAC9C,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,4EAA4E;QAC5E,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,0EAA0E;QAC1E,IAAI,CAAC,EAAE,MAAM,CAAA;KAChB,CAAA;IAED;;OAEG;IAEH,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;IAEvC;;OAEG;IAEH,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IAExC;;OAEG;IAEH,IAAI,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACzC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,GAAG,iBAAiB,CAAC,EAAE,gBAAgB,CAAC,EAAE,qBAAqB,GAAG,MAAM,CAEhI;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,EAAE,gBAAgB,CAAC,EAAE,qBAAqB,EAAE,WAAW,CAAC,EAAE,YAAY,GAAG,MAAM,CAkB5I;AAED,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,qBAAqB,CAyBhE,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,qBAAqB,CA8B/D,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,qBAAqB,CAyBtE,CAAC"}
|
|
@@ -13,6 +13,40 @@
|
|
|
13
13
|
//
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
|
+
// #region vscode
|
|
17
|
+
/*---------------------------------------------------------------------------------------------
|
|
18
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
19
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
20
|
+
*--------------------------------------------------------------------------------------------*/
|
|
21
|
+
// See: https://github.com/microsoft/vscode/blob/9ebb7c43bc99fd6e1a295040674d1f8e5831b9be/src/vs/vscode.d.ts#L5326-L5370
|
|
22
|
+
/**
|
|
23
|
+
* Defines how an argument should be quoted if it contains
|
|
24
|
+
* spaces or unsupported characters.
|
|
25
|
+
*/
|
|
26
|
+
export var ShellQuoting;
|
|
27
|
+
(function (ShellQuoting) {
|
|
28
|
+
/**
|
|
29
|
+
* Character escaping should be used. This for example
|
|
30
|
+
* uses \ on bash and ` on PowerShell.
|
|
31
|
+
*/
|
|
32
|
+
ShellQuoting["Escape"] = "escape";
|
|
33
|
+
/**
|
|
34
|
+
* Strong string quoting should be used. This for example
|
|
35
|
+
* uses " for Windows cmd and ' for bash and PowerShell.
|
|
36
|
+
* Strong quoting treats arguments as literal strings.
|
|
37
|
+
* Under PowerShell echo 'The value is $(2 * 3)' will
|
|
38
|
+
* print `The value is $(2 * 3)`
|
|
39
|
+
*/
|
|
40
|
+
ShellQuoting["Strong"] = "strong";
|
|
41
|
+
/**
|
|
42
|
+
* Weak string quoting should be used. This for example
|
|
43
|
+
* uses " for Windows cmd, bash and PowerShell. Weak quoting
|
|
44
|
+
* still performs some kind of evaluation inside the quoted
|
|
45
|
+
* string. Under PowerShell echo "The value is $(2 * 3)"
|
|
46
|
+
* will print `The value is 6`
|
|
47
|
+
*/
|
|
48
|
+
ShellQuoting["Weak"] = "weak";
|
|
49
|
+
})(ShellQuoting || (ShellQuoting = {}));
|
|
16
50
|
/**
|
|
17
51
|
* Converts a list of args into an escaped shell command.
|
|
18
52
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-quoting.js","sourceRoot":"","sources":["../../src/common/shell-quoting.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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;
|
|
1
|
+
{"version":3,"file":"shell-quoting.js","sourceRoot":"","sources":["../../src/common/shell-quoting.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
import { expect } from 'chai';
|
|
17
|
-
import { escapeForShell, BashQuotingFunctions, CmdQuotingFunctions, PowershellQuotingFunctions } from './shell-quoting.js';
|
|
17
|
+
import { escapeForShell, BashQuotingFunctions, ShellQuoting, CmdQuotingFunctions, PowershellQuotingFunctions } from './shell-quoting.js';
|
|
18
18
|
describe('Shell arguments escaping:', () => {
|
|
19
19
|
// Procedurally execute tests from this list of data.
|
|
20
20
|
const testData = {
|
|
@@ -22,7 +22,7 @@ describe('Shell arguments escaping:', () => {
|
|
|
22
22
|
// https://www.gnu.org/software/bash/manual/html_node/Quoting.html
|
|
23
23
|
quotingFunctions: BashQuotingFunctions,
|
|
24
24
|
data: {
|
|
25
|
-
[
|
|
25
|
+
[ShellQuoting.Escape]: [
|
|
26
26
|
{ input: 'abc', expected: 'abc' },
|
|
27
27
|
{ input: 'ab c', expected: 'ab\\ c' },
|
|
28
28
|
{ input: 'ab"c', expected: 'ab\\"c' },
|
|
@@ -33,7 +33,7 @@ describe('Shell arguments escaping:', () => {
|
|
|
33
33
|
expected: 'setTimeout\\(\\(\\)\\ =\\>\\ \\{\\ console.log\\(1,\\ \\"2\\\'3\\"\\)\\;\\ \\},\\ 100\\)',
|
|
34
34
|
},
|
|
35
35
|
],
|
|
36
|
-
[
|
|
36
|
+
[ShellQuoting.Strong]: [
|
|
37
37
|
{ input: 'abc', expected: '\'abc\'' },
|
|
38
38
|
{ input: 'ab c', expected: '\'ab c\'' },
|
|
39
39
|
{ input: 'ab"c', expected: '\'ab"c\'' },
|
|
@@ -44,7 +44,7 @@ describe('Shell arguments escaping:', () => {
|
|
|
44
44
|
expected: '\'setTimeout(() => { console.log(1, "2\'"\'"\'3"); }, 100)\'',
|
|
45
45
|
},
|
|
46
46
|
],
|
|
47
|
-
[
|
|
47
|
+
[ShellQuoting.Weak]: [
|
|
48
48
|
{ input: 'abc', expected: '"abc"' },
|
|
49
49
|
{ input: 'ab c', expected: '"ab c"' },
|
|
50
50
|
{ input: 'ab"c', expected: '"ab\\"c"' },
|
|
@@ -61,7 +61,7 @@ describe('Shell arguments escaping:', () => {
|
|
|
61
61
|
// https://ss64.com/nt/syntax-esc.html
|
|
62
62
|
quotingFunctions: CmdQuotingFunctions,
|
|
63
63
|
data: {
|
|
64
|
-
[
|
|
64
|
+
[ShellQuoting.Escape]: [
|
|
65
65
|
{ input: 'abc', expected: 'abc' },
|
|
66
66
|
{ input: 'ab c', expected: 'ab" "c' },
|
|
67
67
|
{ input: 'ab"c', expected: 'ab\\"c' },
|
|
@@ -76,7 +76,7 @@ describe('Shell arguments escaping:', () => {
|
|
|
76
76
|
expected: 'console.log^(\\"^%PATH^%\\"^)',
|
|
77
77
|
},
|
|
78
78
|
],
|
|
79
|
-
[
|
|
79
|
+
[ShellQuoting.Strong]: [
|
|
80
80
|
{ input: 'abc', expected: '"abc"' },
|
|
81
81
|
{ input: 'ab c', expected: '"ab c"' },
|
|
82
82
|
{ input: 'ab"c', expected: '"ab\\"c"' },
|
|
@@ -91,7 +91,7 @@ describe('Shell arguments escaping:', () => {
|
|
|
91
91
|
expected: '"console.log^(\\""%"PATH"%"\\"^)"',
|
|
92
92
|
},
|
|
93
93
|
],
|
|
94
|
-
[
|
|
94
|
+
[ShellQuoting.Weak]: [
|
|
95
95
|
{ input: 'abc', expected: '"abc"' },
|
|
96
96
|
{ input: 'ab c', expected: '"ab c"' },
|
|
97
97
|
{ input: 'ab"c', expected: '"ab\\"c"' },
|
|
@@ -112,7 +112,7 @@ describe('Shell arguments escaping:', () => {
|
|
|
112
112
|
// https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_quoting_rules?view=powershell-6
|
|
113
113
|
quotingFunctions: PowershellQuotingFunctions,
|
|
114
114
|
data: {
|
|
115
|
-
[
|
|
115
|
+
[ShellQuoting.Escape]: [
|
|
116
116
|
{ input: 'abc', expected: 'abc' },
|
|
117
117
|
{ input: 'ab c', expected: 'ab` c' },
|
|
118
118
|
{ input: 'ab"c', expected: 'ab`"c' },
|
|
@@ -123,7 +123,7 @@ describe('Shell arguments escaping:', () => {
|
|
|
123
123
|
expected: 'setTimeout`(`(`)` =`>` `{` console.log`(1,` `"2`\'3`"`)`;` `},` 100`)',
|
|
124
124
|
},
|
|
125
125
|
],
|
|
126
|
-
[
|
|
126
|
+
[ShellQuoting.Strong]: [
|
|
127
127
|
{ input: 'abc', expected: '\'abc\'' },
|
|
128
128
|
{ input: 'ab c', expected: '\'ab c\'' },
|
|
129
129
|
{ input: 'ab"c', expected: '\'ab"c\'' },
|
|
@@ -134,7 +134,7 @@ describe('Shell arguments escaping:', () => {
|
|
|
134
134
|
expected: '\'setTimeout(() => { console.log(1, "2\'\'3"); }, 100)\'',
|
|
135
135
|
},
|
|
136
136
|
],
|
|
137
|
-
[
|
|
137
|
+
[ShellQuoting.Weak]: [
|
|
138
138
|
{ input: 'abc', expected: '"abc"' },
|
|
139
139
|
{ input: 'ab c', expected: '"ab c"' },
|
|
140
140
|
{ input: 'ab"c', expected: '"ab`"c"' },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-quoting.spec.js","sourceRoot":"","sources":["../../src/common/shell-quoting.spec.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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;AAEhF,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAAE,cAAc,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"shell-quoting.spec.js","sourceRoot":"","sources":["../../src/common/shell-quoting.spec.ts"],"names":[],"mappings":"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"}
|