@xterm/xterm 6.1.0-beta.16 → 6.1.0-beta.161

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 (155) hide show
  1. package/README.md +27 -28
  2. package/css/xterm.css +29 -22
  3. package/lib/xterm.js +1 -1
  4. package/lib/xterm.js.map +1 -1
  5. package/lib/xterm.mjs +8 -34
  6. package/lib/xterm.mjs.map +4 -4
  7. package/package.json +28 -17
  8. package/src/browser/AccessibilityManager.ts +6 -3
  9. package/src/browser/CoreBrowserTerminal.ts +142 -62
  10. package/src/browser/Dom.ts +178 -0
  11. package/src/browser/Linkifier.ts +3 -3
  12. package/src/browser/OscLinkProvider.ts +3 -1
  13. package/src/browser/RenderDebouncer.ts +2 -2
  14. package/src/browser/TimeBasedDebouncer.ts +2 -2
  15. package/src/browser/Types.ts +12 -11
  16. package/src/browser/Viewport.ts +40 -17
  17. package/src/browser/decorations/BufferDecorationRenderer.ts +1 -1
  18. package/src/browser/decorations/OverviewRulerRenderer.ts +15 -16
  19. package/src/browser/input/CompositionHelper.ts +10 -1
  20. package/src/browser/public/Terminal.ts +24 -27
  21. package/src/browser/renderer/dom/DomRenderer.ts +128 -8
  22. package/src/browser/renderer/dom/DomRendererRowFactory.ts +19 -13
  23. package/src/browser/renderer/dom/WidthCache.ts +54 -52
  24. package/src/browser/renderer/shared/Constants.ts +7 -0
  25. package/src/browser/renderer/shared/TextBlinkStateManager.ts +97 -0
  26. package/src/browser/renderer/shared/Types.ts +8 -2
  27. package/src/browser/scrollable/abstractScrollbar.ts +300 -0
  28. package/src/browser/scrollable/fastDomNode.ts +126 -0
  29. package/src/browser/scrollable/globalPointerMoveMonitor.ts +90 -0
  30. package/src/browser/scrollable/horizontalScrollbar.ts +85 -0
  31. package/src/browser/scrollable/mouseEvent.ts +292 -0
  32. package/src/browser/scrollable/scrollable.ts +486 -0
  33. package/src/browser/scrollable/scrollableElement.ts +579 -0
  34. package/src/browser/scrollable/scrollableElementOptions.ts +161 -0
  35. package/src/browser/scrollable/scrollbarArrow.ts +110 -0
  36. package/src/browser/scrollable/scrollbarState.ts +246 -0
  37. package/src/browser/scrollable/scrollbarVisibilityController.ts +113 -0
  38. package/src/browser/scrollable/touch.ts +481 -0
  39. package/src/browser/scrollable/verticalScrollbar.ts +143 -0
  40. package/src/browser/scrollable/widget.ts +23 -0
  41. package/src/browser/services/CharSizeService.ts +2 -2
  42. package/src/browser/services/CoreBrowserService.ts +4 -4
  43. package/src/browser/services/KeyboardService.ts +67 -0
  44. package/src/browser/services/LinkProviderService.ts +1 -1
  45. package/src/browser/services/MouseService.ts +2 -1
  46. package/src/browser/services/RenderService.ts +22 -15
  47. package/src/browser/services/SelectionService.ts +12 -4
  48. package/src/browser/services/Services.ts +24 -15
  49. package/src/browser/services/ThemeService.ts +2 -2
  50. package/src/common/Async.ts +105 -0
  51. package/src/common/CircularList.ts +2 -2
  52. package/src/common/Color.ts +8 -0
  53. package/src/common/CoreTerminal.ts +21 -11
  54. package/src/common/Event.ts +118 -0
  55. package/src/common/InputHandler.ts +244 -24
  56. package/src/common/Lifecycle.ts +113 -0
  57. package/src/common/Platform.ts +13 -3
  58. package/src/common/SortedList.ts +7 -3
  59. package/src/common/TaskQueue.ts +9 -3
  60. package/src/common/Types.ts +27 -7
  61. package/src/common/Version.ts +9 -0
  62. package/src/common/buffer/Buffer.ts +20 -14
  63. package/src/common/buffer/BufferLine.ts +4 -5
  64. package/src/common/buffer/BufferSet.ts +7 -6
  65. package/src/common/buffer/CellData.ts +57 -0
  66. package/src/common/buffer/Marker.ts +2 -2
  67. package/src/common/buffer/Types.ts +6 -2
  68. package/src/common/data/EscapeSequences.ts +71 -70
  69. package/src/common/input/Keyboard.ts +7 -6
  70. package/src/common/input/KittyKeyboard.ts +491 -0
  71. package/src/common/input/Win32InputMode.ts +297 -0
  72. package/src/common/input/WriteBuffer.ts +34 -2
  73. package/src/common/input/XParseColor.ts +2 -2
  74. package/src/common/parser/ApcParser.ts +245 -0
  75. package/src/common/parser/Constants.ts +22 -4
  76. package/src/common/parser/DcsParser.ts +5 -5
  77. package/src/common/parser/EscapeSequenceParser.ts +75 -22
  78. package/src/common/parser/OscParser.ts +5 -5
  79. package/src/common/parser/Types.ts +34 -1
  80. package/src/common/public/BufferLineApiView.ts +2 -2
  81. package/src/common/public/BufferNamespaceApi.ts +2 -2
  82. package/src/common/public/ParserApi.ts +3 -0
  83. package/src/common/services/BufferService.ts +8 -5
  84. package/src/common/services/CharsetService.ts +4 -0
  85. package/src/common/services/CoreMouseService.ts +2 -2
  86. package/src/common/services/CoreService.ts +18 -4
  87. package/src/common/services/DecorationService.ts +24 -8
  88. package/src/common/services/LogService.ts +1 -31
  89. package/src/common/services/OptionsService.ts +13 -4
  90. package/src/common/services/Services.ts +39 -16
  91. package/src/common/services/UnicodeService.ts +1 -1
  92. package/typings/xterm.d.ts +319 -35
  93. package/src/common/TypedArrayUtils.ts +0 -17
  94. package/src/vs/base/browser/browser.ts +0 -141
  95. package/src/vs/base/browser/canIUse.ts +0 -49
  96. package/src/vs/base/browser/dom.ts +0 -2369
  97. package/src/vs/base/browser/fastDomNode.ts +0 -316
  98. package/src/vs/base/browser/globalPointerMoveMonitor.ts +0 -112
  99. package/src/vs/base/browser/iframe.ts +0 -135
  100. package/src/vs/base/browser/keyboardEvent.ts +0 -213
  101. package/src/vs/base/browser/mouseEvent.ts +0 -229
  102. package/src/vs/base/browser/touch.ts +0 -372
  103. package/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts +0 -303
  104. package/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts +0 -114
  105. package/src/vs/base/browser/ui/scrollbar/scrollableElement.ts +0 -720
  106. package/src/vs/base/browser/ui/scrollbar/scrollableElementOptions.ts +0 -165
  107. package/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts +0 -114
  108. package/src/vs/base/browser/ui/scrollbar/scrollbarState.ts +0 -243
  109. package/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts +0 -118
  110. package/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts +0 -116
  111. package/src/vs/base/browser/ui/widget.ts +0 -57
  112. package/src/vs/base/browser/window.ts +0 -14
  113. package/src/vs/base/common/arrays.ts +0 -887
  114. package/src/vs/base/common/arraysFind.ts +0 -202
  115. package/src/vs/base/common/assert.ts +0 -71
  116. package/src/vs/base/common/async.ts +0 -1992
  117. package/src/vs/base/common/cancellation.ts +0 -148
  118. package/src/vs/base/common/charCode.ts +0 -450
  119. package/src/vs/base/common/collections.ts +0 -140
  120. package/src/vs/base/common/decorators.ts +0 -130
  121. package/src/vs/base/common/equals.ts +0 -146
  122. package/src/vs/base/common/errors.ts +0 -303
  123. package/src/vs/base/common/event.ts +0 -1778
  124. package/src/vs/base/common/functional.ts +0 -32
  125. package/src/vs/base/common/hash.ts +0 -316
  126. package/src/vs/base/common/iterator.ts +0 -159
  127. package/src/vs/base/common/keyCodes.ts +0 -526
  128. package/src/vs/base/common/keybindings.ts +0 -284
  129. package/src/vs/base/common/lazy.ts +0 -47
  130. package/src/vs/base/common/lifecycle.ts +0 -801
  131. package/src/vs/base/common/linkedList.ts +0 -142
  132. package/src/vs/base/common/map.ts +0 -202
  133. package/src/vs/base/common/numbers.ts +0 -98
  134. package/src/vs/base/common/observable.ts +0 -76
  135. package/src/vs/base/common/observableInternal/api.ts +0 -31
  136. package/src/vs/base/common/observableInternal/autorun.ts +0 -281
  137. package/src/vs/base/common/observableInternal/base.ts +0 -489
  138. package/src/vs/base/common/observableInternal/debugName.ts +0 -145
  139. package/src/vs/base/common/observableInternal/derived.ts +0 -428
  140. package/src/vs/base/common/observableInternal/lazyObservableValue.ts +0 -146
  141. package/src/vs/base/common/observableInternal/logging.ts +0 -328
  142. package/src/vs/base/common/observableInternal/promise.ts +0 -209
  143. package/src/vs/base/common/observableInternal/utils.ts +0 -610
  144. package/src/vs/base/common/platform.ts +0 -281
  145. package/src/vs/base/common/scrollable.ts +0 -522
  146. package/src/vs/base/common/sequence.ts +0 -34
  147. package/src/vs/base/common/stopwatch.ts +0 -43
  148. package/src/vs/base/common/strings.ts +0 -557
  149. package/src/vs/base/common/symbols.ts +0 -9
  150. package/src/vs/base/common/uint.ts +0 -59
  151. package/src/vs/patches/nls.ts +0 -90
  152. package/src/vs/typings/base-common.d.ts +0 -20
  153. package/src/vs/typings/require.d.ts +0 -42
  154. package/src/vs/typings/vscode-globals-nls.d.ts +0 -36
  155. package/src/vs/typings/vscode-globals-product.d.ts +0 -33
@@ -1,428 +0,0 @@
1
- /*---------------------------------------------------------------------------------------------
2
- * Copyright (c) Microsoft Corporation. All rights reserved.
3
- * Licensed under the MIT License. See License.txt in the project root for license information.
4
- *--------------------------------------------------------------------------------------------*/
5
-
6
- import { assertFn } from 'vs/base/common/assert';
7
- import { EqualityComparer, strictEquals } from 'vs/base/common/equals';
8
- import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
9
- import { BaseObservable, IChangeContext, IObservable, IObserver, IReader, ISettableObservable, ITransaction, _setDerivedOpts, } from 'vs/base/common/observableInternal/base';
10
- import { DebugNameData, IDebugNameData, DebugOwner } from 'vs/base/common/observableInternal/debugName';
11
- import { getLogger } from 'vs/base/common/observableInternal/logging';
12
-
13
- /**
14
- * Creates an observable that is derived from other observables.
15
- * The value is only recomputed when absolutely needed.
16
- *
17
- * {@link computeFn} should start with a JS Doc using `@description` to name the derived.
18
- */
19
- export function derived<T>(computeFn: (reader: IReader) => T): IObservable<T>;
20
- export function derived<T>(owner: DebugOwner, computeFn: (reader: IReader) => T): IObservable<T>;
21
- export function derived<T>(computeFnOrOwner: ((reader: IReader) => T) | DebugOwner, computeFn?: ((reader: IReader) => T) | undefined): IObservable<T> {
22
- if (computeFn !== undefined) {
23
- return new Derived(
24
- new DebugNameData(computeFnOrOwner, undefined, computeFn),
25
- computeFn,
26
- undefined,
27
- undefined,
28
- undefined,
29
- strictEquals
30
- );
31
- }
32
- return new Derived(
33
- new DebugNameData(undefined, undefined, computeFnOrOwner as any),
34
- computeFnOrOwner as any,
35
- undefined,
36
- undefined,
37
- undefined,
38
- strictEquals
39
- );
40
- }
41
-
42
- export function derivedWithSetter<T>(owner: DebugOwner | undefined, computeFn: (reader: IReader) => T, setter: (value: T, transaction: ITransaction | undefined) => void): ISettableObservable<T> {
43
- return new DerivedWithSetter(
44
- new DebugNameData(owner, undefined, computeFn),
45
- computeFn,
46
- undefined,
47
- undefined,
48
- undefined,
49
- strictEquals,
50
- setter,
51
- );
52
- }
53
-
54
- export function derivedOpts<T>(
55
- options: IDebugNameData & {
56
- equalsFn?: EqualityComparer<T>;
57
- onLastObserverRemoved?: (() => void);
58
- },
59
- computeFn: (reader: IReader) => T
60
- ): IObservable<T> {
61
- return new Derived(
62
- new DebugNameData(options.owner, options.debugName, options.debugReferenceFn),
63
- computeFn,
64
- undefined,
65
- undefined,
66
- options.onLastObserverRemoved,
67
- options.equalsFn ?? strictEquals
68
- );
69
- }
70
-
71
- _setDerivedOpts(derivedOpts);
72
-
73
- /**
74
- * Represents an observable that is derived from other observables.
75
- * The value is only recomputed when absolutely needed.
76
- *
77
- * {@link computeFn} should start with a JS Doc using `@description` to name the derived.
78
- *
79
- * Use `createEmptyChangeSummary` to create a "change summary" that can collect the changes.
80
- * Use `handleChange` to add a reported change to the change summary.
81
- * The compute function is given the last change summary.
82
- * The change summary is discarded after the compute function was called.
83
- *
84
- * @see derived
85
- */
86
- export function derivedHandleChanges<T, TChangeSummary>(
87
- options: IDebugNameData & {
88
- createEmptyChangeSummary: () => TChangeSummary;
89
- handleChange: (context: IChangeContext, changeSummary: TChangeSummary) => boolean;
90
- equalityComparer?: EqualityComparer<T>;
91
- },
92
- computeFn: (reader: IReader, changeSummary: TChangeSummary) => T
93
- ): IObservable<T> {
94
- return new Derived(
95
- new DebugNameData(options.owner, options.debugName, undefined),
96
- computeFn,
97
- options.createEmptyChangeSummary,
98
- options.handleChange,
99
- undefined,
100
- options.equalityComparer ?? strictEquals
101
- );
102
- }
103
-
104
- export function derivedWithStore<T>(computeFn: (reader: IReader, store: DisposableStore) => T): IObservable<T>;
105
- export function derivedWithStore<T>(owner: object, computeFn: (reader: IReader, store: DisposableStore) => T): IObservable<T>;
106
- export function derivedWithStore<T>(computeFnOrOwner: ((reader: IReader, store: DisposableStore) => T) | object, computeFnOrUndefined?: ((reader: IReader, store: DisposableStore) => T)): IObservable<T> {
107
- let computeFn: (reader: IReader, store: DisposableStore) => T;
108
- let owner: DebugOwner;
109
- if (computeFnOrUndefined === undefined) {
110
- computeFn = computeFnOrOwner as any;
111
- owner = undefined;
112
- } else {
113
- owner = computeFnOrOwner;
114
- computeFn = computeFnOrUndefined as any;
115
- }
116
-
117
- const store = new DisposableStore();
118
- return new Derived(
119
- new DebugNameData(owner, undefined, computeFn),
120
- r => {
121
- store.clear();
122
- return computeFn(r, store);
123
- }, undefined,
124
- undefined,
125
- () => store.dispose(),
126
- strictEquals
127
- );
128
- }
129
-
130
- export function derivedDisposable<T extends IDisposable | undefined>(computeFn: (reader: IReader) => T): IObservable<T>;
131
- export function derivedDisposable<T extends IDisposable | undefined>(owner: DebugOwner, computeFn: (reader: IReader) => T): IObservable<T>;
132
- export function derivedDisposable<T extends IDisposable | undefined>(computeFnOrOwner: ((reader: IReader) => T) | DebugOwner, computeFnOrUndefined?: ((reader: IReader) => T)): IObservable<T> {
133
- let computeFn: (reader: IReader) => T;
134
- let owner: DebugOwner;
135
- if (computeFnOrUndefined === undefined) {
136
- computeFn = computeFnOrOwner as any;
137
- owner = undefined;
138
- } else {
139
- owner = computeFnOrOwner;
140
- computeFn = computeFnOrUndefined as any;
141
- }
142
-
143
- let store: DisposableStore | undefined = undefined;
144
- return new Derived(
145
- new DebugNameData(owner, undefined, computeFn),
146
- r => {
147
- if (!store) {
148
- store = new DisposableStore();
149
- } else {
150
- store.clear();
151
- }
152
- const result = computeFn(r);
153
- if (result) {
154
- store.add(result);
155
- }
156
- return result;
157
- }, undefined,
158
- undefined,
159
- () => {
160
- if (store) {
161
- store.dispose();
162
- store = undefined;
163
- }
164
- },
165
- strictEquals
166
- );
167
- }
168
-
169
- const enum DerivedState {
170
- /** Initial state, no previous value, recomputation needed */
171
- initial = 0,
172
-
173
- /**
174
- * A dependency could have changed.
175
- * We need to explicitly ask them if at least one dependency changed.
176
- */
177
- dependenciesMightHaveChanged = 1,
178
-
179
- /**
180
- * A dependency changed and we need to recompute.
181
- * After recomputation, we need to check the previous value to see if we changed as well.
182
- */
183
- stale = 2,
184
-
185
- /**
186
- * No change reported, our cached value is up to date.
187
- */
188
- upToDate = 3,
189
- }
190
-
191
- export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> implements IReader, IObserver {
192
- private state = DerivedState.initial;
193
- private value: T | undefined = undefined;
194
- private updateCount = 0;
195
- private dependencies = new Set<IObservable<any>>();
196
- private dependenciesToBeRemoved = new Set<IObservable<any>>();
197
- private changeSummary: TChangeSummary | undefined = undefined;
198
-
199
- public override get debugName(): string {
200
- return this._debugNameData.getDebugName(this) ?? '(anonymous)';
201
- }
202
-
203
- constructor(
204
- public readonly _debugNameData: DebugNameData,
205
- public readonly _computeFn: (reader: IReader, changeSummary: TChangeSummary) => T,
206
- private readonly createChangeSummary: (() => TChangeSummary) | undefined,
207
- private readonly _handleChange: ((context: IChangeContext, summary: TChangeSummary) => boolean) | undefined,
208
- private readonly _handleLastObserverRemoved: (() => void) | undefined = undefined,
209
- private readonly _equalityComparator: EqualityComparer<T>,
210
- ) {
211
- super();
212
- this.changeSummary = this.createChangeSummary?.();
213
- getLogger()?.handleDerivedCreated(this);
214
- }
215
-
216
- protected override onLastObserverRemoved(): void {
217
- /**
218
- * We are not tracking changes anymore, thus we have to assume
219
- * that our cache is invalid.
220
- */
221
- this.state = DerivedState.initial;
222
- this.value = undefined;
223
- for (const d of this.dependencies) {
224
- d.removeObserver(this);
225
- }
226
- this.dependencies.clear();
227
-
228
- this._handleLastObserverRemoved?.();
229
- }
230
-
231
- public override get(): T {
232
- if (this.observers.size === 0) {
233
- // Without observers, we don't know when to clean up stuff.
234
- // Thus, we don't cache anything to prevent memory leaks.
235
- const result = this._computeFn(this, this.createChangeSummary?.()!);
236
- // Clear new dependencies
237
- this.onLastObserverRemoved();
238
- return result;
239
- } else {
240
- do {
241
- // We might not get a notification for a dependency that changed while it is updating,
242
- // thus we also have to ask all our depedencies if they changed in this case.
243
- if (this.state === DerivedState.dependenciesMightHaveChanged) {
244
- for (const d of this.dependencies) {
245
- /** might call {@link handleChange} indirectly, which could make us stale */
246
- d.reportChanges();
247
-
248
- if (this.state as DerivedState === DerivedState.stale) {
249
- // The other dependencies will refresh on demand, so early break
250
- break;
251
- }
252
- }
253
- }
254
-
255
- // We called report changes of all dependencies.
256
- // If we are still not stale, we can assume to be up to date again.
257
- if (this.state === DerivedState.dependenciesMightHaveChanged) {
258
- this.state = DerivedState.upToDate;
259
- }
260
-
261
- this._recomputeIfNeeded();
262
- // In case recomputation changed one of our dependencies, we need to recompute again.
263
- } while (this.state !== DerivedState.upToDate);
264
- return this.value!;
265
- }
266
- }
267
-
268
- private _recomputeIfNeeded() {
269
- if (this.state === DerivedState.upToDate) {
270
- return;
271
- }
272
- const emptySet = this.dependenciesToBeRemoved;
273
- this.dependenciesToBeRemoved = this.dependencies;
274
- this.dependencies = emptySet;
275
-
276
- const hadValue = this.state !== DerivedState.initial;
277
- const oldValue = this.value;
278
- this.state = DerivedState.upToDate;
279
-
280
- const changeSummary = this.changeSummary!;
281
- this.changeSummary = this.createChangeSummary?.();
282
- try {
283
- /** might call {@link handleChange} indirectly, which could invalidate us */
284
- this.value = this._computeFn(this, changeSummary);
285
- } finally {
286
- // We don't want our observed observables to think that they are (not even temporarily) not being observed.
287
- // Thus, we only unsubscribe from observables that are definitely not read anymore.
288
- for (const o of this.dependenciesToBeRemoved) {
289
- o.removeObserver(this);
290
- }
291
- this.dependenciesToBeRemoved.clear();
292
- }
293
-
294
- const didChange = hadValue && !(this._equalityComparator(oldValue!, this.value));
295
-
296
- getLogger()?.handleDerivedRecomputed(this, {
297
- oldValue,
298
- newValue: this.value,
299
- change: undefined,
300
- didChange,
301
- hadValue,
302
- });
303
-
304
- if (didChange) {
305
- for (const r of this.observers) {
306
- r.handleChange(this, undefined);
307
- }
308
- }
309
- }
310
-
311
- public override toString(): string {
312
- return `LazyDerived<${this.debugName}>`;
313
- }
314
-
315
- // IObserver Implementation
316
- public beginUpdate<T>(_observable: IObservable<T>): void {
317
- this.updateCount++;
318
- const propagateBeginUpdate = this.updateCount === 1;
319
- if (this.state === DerivedState.upToDate) {
320
- this.state = DerivedState.dependenciesMightHaveChanged;
321
- // If we propagate begin update, that will already signal a possible change.
322
- if (!propagateBeginUpdate) {
323
- for (const r of this.observers) {
324
- r.handlePossibleChange(this);
325
- }
326
- }
327
- }
328
- if (propagateBeginUpdate) {
329
- for (const r of this.observers) {
330
- r.beginUpdate(this); // This signals a possible change
331
- }
332
- }
333
- }
334
-
335
- public endUpdate<T>(_observable: IObservable<T>): void {
336
- this.updateCount--;
337
- if (this.updateCount === 0) {
338
- // End update could change the observer list.
339
- const observers = [...this.observers];
340
- for (const r of observers) {
341
- r.endUpdate(this);
342
- }
343
- }
344
- assertFn(() => this.updateCount >= 0);
345
- }
346
-
347
- public handlePossibleChange<T>(observable: IObservable<T, unknown>): void {
348
- // In all other states, observers already know that we might have changed.
349
- if (this.state === DerivedState.upToDate && this.dependencies.has(observable) && !this.dependenciesToBeRemoved.has(observable)) {
350
- this.state = DerivedState.dependenciesMightHaveChanged;
351
- for (const r of this.observers) {
352
- r.handlePossibleChange(this);
353
- }
354
- }
355
- }
356
-
357
- public handleChange<T, TChange>(observable: IObservable<T, TChange>, change: TChange): void {
358
- if (this.dependencies.has(observable) && !this.dependenciesToBeRemoved.has(observable)) {
359
- const shouldReact = this._handleChange ? this._handleChange({
360
- changedObservable: observable,
361
- change,
362
- didChange: (o): this is any => o === observable as any,
363
- }, this.changeSummary!) : true;
364
- const wasUpToDate = this.state === DerivedState.upToDate;
365
- if (shouldReact && (this.state === DerivedState.dependenciesMightHaveChanged || wasUpToDate)) {
366
- this.state = DerivedState.stale;
367
- if (wasUpToDate) {
368
- for (const r of this.observers) {
369
- r.handlePossibleChange(this);
370
- }
371
- }
372
- }
373
- }
374
- }
375
-
376
- // IReader Implementation
377
- public readObservable<T>(observable: IObservable<T>): T {
378
- // Subscribe before getting the value to enable caching
379
- observable.addObserver(this);
380
- /** This might call {@link handleChange} indirectly, which could invalidate us */
381
- const value = observable.get();
382
- // Which is why we only add the observable to the dependencies now.
383
- this.dependencies.add(observable);
384
- this.dependenciesToBeRemoved.delete(observable);
385
- return value;
386
- }
387
-
388
- public override addObserver(observer: IObserver): void {
389
- const shouldCallBeginUpdate = !this.observers.has(observer) && this.updateCount > 0;
390
- super.addObserver(observer);
391
-
392
- if (shouldCallBeginUpdate) {
393
- observer.beginUpdate(this);
394
- }
395
- }
396
-
397
- public override removeObserver(observer: IObserver): void {
398
- const shouldCallEndUpdate = this.observers.has(observer) && this.updateCount > 0;
399
- super.removeObserver(observer);
400
-
401
- if (shouldCallEndUpdate) {
402
- // Calling end update after removing the observer makes sure endUpdate cannot be called twice here.
403
- observer.endUpdate(this);
404
- }
405
- }
406
- }
407
-
408
-
409
- export class DerivedWithSetter<T, TChangeSummary = any> extends Derived<T, TChangeSummary> implements ISettableObservable<T> {
410
- constructor(
411
- debugNameData: DebugNameData,
412
- computeFn: (reader: IReader, changeSummary: TChangeSummary) => T,
413
- createChangeSummary: (() => TChangeSummary) | undefined,
414
- handleChange: ((context: IChangeContext, summary: TChangeSummary) => boolean) | undefined,
415
- handleLastObserverRemoved: (() => void) | undefined = undefined,
416
- equalityComparator: EqualityComparer<T>,
417
- public readonly set: (value: T, tx: ITransaction | undefined) => void,
418
- ) {
419
- super(
420
- debugNameData,
421
- computeFn,
422
- createChangeSummary,
423
- handleChange,
424
- handleLastObserverRemoved,
425
- equalityComparator,
426
- );
427
- }
428
- }
@@ -1,146 +0,0 @@
1
- /*---------------------------------------------------------------------------------------------
2
- * Copyright (c) Microsoft Corporation. All rights reserved.
3
- * Licensed under the MIT License. See License.txt in the project root for license information.
4
- *--------------------------------------------------------------------------------------------*/
5
-
6
- import { EqualityComparer } from 'vs/base/common/equals';
7
- import { ISettableObservable, ITransaction } from 'vs/base/common/observable';
8
- import { BaseObservable, IObserver, TransactionImpl } from 'vs/base/common/observableInternal/base';
9
- import { DebugNameData } from 'vs/base/common/observableInternal/debugName';
10
-
11
- /**
12
- * Holds off updating observers until the value is actually read.
13
- */
14
- export class LazyObservableValue<T, TChange = void>
15
- extends BaseObservable<T, TChange>
16
- implements ISettableObservable<T, TChange> {
17
- protected _value: T;
18
- private _isUpToDate = true;
19
- private readonly _deltas: TChange[] = [];
20
-
21
- get debugName() {
22
- return this._debugNameData.getDebugName(this) ?? 'LazyObservableValue';
23
- }
24
-
25
- constructor(
26
- private readonly _debugNameData: DebugNameData,
27
- initialValue: T,
28
- private readonly _equalityComparator: EqualityComparer<T>,
29
- ) {
30
- super();
31
- this._value = initialValue;
32
- }
33
-
34
- public override get(): T {
35
- this._update();
36
- return this._value;
37
- }
38
-
39
- private _update(): void {
40
- if (this._isUpToDate) {
41
- return;
42
- }
43
- this._isUpToDate = true;
44
-
45
- if (this._deltas.length > 0) {
46
- for (const observer of this.observers) {
47
- for (const change of this._deltas) {
48
- observer.handleChange(this, change);
49
- }
50
- }
51
- this._deltas.length = 0;
52
- } else {
53
- for (const observer of this.observers) {
54
- observer.handleChange(this, undefined);
55
- }
56
- }
57
- }
58
-
59
- private _updateCounter = 0;
60
-
61
- private _beginUpdate(): void {
62
- this._updateCounter++;
63
- if (this._updateCounter === 1) {
64
- for (const observer of this.observers) {
65
- observer.beginUpdate(this);
66
- }
67
- }
68
- }
69
-
70
- private _endUpdate(): void {
71
- this._updateCounter--;
72
- if (this._updateCounter === 0) {
73
- this._update();
74
-
75
- // End update could change the observer list.
76
- const observers = [...this.observers];
77
- for (const r of observers) {
78
- r.endUpdate(this);
79
- }
80
- }
81
- }
82
-
83
- public override addObserver(observer: IObserver): void {
84
- const shouldCallBeginUpdate = !this.observers.has(observer) && this._updateCounter > 0;
85
- super.addObserver(observer);
86
-
87
- if (shouldCallBeginUpdate) {
88
- observer.beginUpdate(this);
89
- }
90
- }
91
-
92
- public override removeObserver(observer: IObserver): void {
93
- const shouldCallEndUpdate = this.observers.has(observer) && this._updateCounter > 0;
94
- super.removeObserver(observer);
95
-
96
- if (shouldCallEndUpdate) {
97
- // Calling end update after removing the observer makes sure endUpdate cannot be called twice here.
98
- observer.endUpdate(this);
99
- }
100
- }
101
-
102
- public set(value: T, tx: ITransaction | undefined, change: TChange): void {
103
- if (change === undefined && this._equalityComparator(this._value, value)) {
104
- return;
105
- }
106
-
107
- let _tx: TransactionImpl | undefined;
108
- if (!tx) {
109
- tx = _tx = new TransactionImpl(() => { }, () => `Setting ${this.debugName}`);
110
- }
111
- try {
112
- this._isUpToDate = false;
113
- this._setValue(value);
114
- if (change !== undefined) {
115
- this._deltas.push(change);
116
- }
117
-
118
- tx.updateObserver({
119
- beginUpdate: () => this._beginUpdate(),
120
- endUpdate: () => this._endUpdate(),
121
- handleChange: (observable, change) => { },
122
- handlePossibleChange: (observable) => { },
123
- }, this);
124
-
125
- if (this._updateCounter > 1) {
126
- // We already started begin/end update, so we need to manually call handlePossibleChange
127
- for (const observer of this.observers) {
128
- observer.handlePossibleChange(this);
129
- }
130
- }
131
-
132
- } finally {
133
- if (_tx) {
134
- _tx.finish();
135
- }
136
- }
137
- }
138
-
139
- override toString(): string {
140
- return `${this.debugName}: ${this._value}`;
141
- }
142
-
143
- protected _setValue(newValue: T): void {
144
- this._value = newValue;
145
- }
146
- }