@theia/core 1.75.0 → 1.76.0-next.4

package/lib/browser/decorations-service.d.ts

@@ -1,7 +1,14 @@
 import { CancellationToken, Disposable, Event } from '../common';
 import URI from '../common/uri';
 export interface DecorationsProvider {
-    readonly onDidChange: Event<URI[]>;
+    /**
+     * Signals that decorations changed for the given resources. Firing `undefined` is a
+     * flush event: all previously provided decorations may have changed, cached data is
+     * dropped and re-fetched on demand. The last known decorations keep being served
+     * until the re-fetch of their resource settles, so that displayed decorations do
+     * not blink out while the round trip is in flight.
+     */
+    readonly onDidChange: Event<URI[] | undefined>;
     provideDecorations(uri: URI, token: CancellationToken): Decoration | Promise<Decoration | undefined> | undefined;
 }
 export interface Decoration {
@@ -16,6 +23,16 @@ export interface ResourceDecorationChangeEvent {
 }
 export declare const DecorationsService: unique symbol;
 export interface DecorationsService {
+    /**
+     * Fired when decorations changed. The payload maps the string representation of the
+     * affected resource URIs to their new decoration. Removals are never part of the
+     * payload: resources whose decoration was removed are simply absent, and an empty
+     * map signals that an unspecified set of decorations changed (e.g. a provider fired
+     * a flush event). Clients must therefore track the resources they display and
+     * re-query them on every event rather than react to the payload keys alone. Change
+     * notifications caused by asynchronously resolving decoration requests are batched:
+     * many resolutions result in a single event.
+     */
     readonly onDidChangeDecorations: Event<Map<string, Decoration>>;
     registerDecorationsProvider(provider: DecorationsProvider): Disposable;
     getDecoration(uri: URI, includeChildren: boolean): Decoration[];
@@ -23,9 +40,20 @@ export interface DecorationsService {
 export declare class DecorationsServiceImpl implements DecorationsService {
     private readonly data;
     private readonly onDidChangeDecorationsEmitter;
+    /**
+     * Accumulates decoration changes until the batched {@link onDidChangeDecorations}
+     * event fires. `undefined` values mark removed decorations.
+     */
+    private readonly pendingChanges;
+    private pendingFlush;
     readonly onDidChangeDecorations: Event<Map<string, Decoration>>;
+    /** Coalesces all changes of the same tick into a single event. */
+    protected readonly fireSoon: import("lodash").DebouncedFunc<() => void>;
     dispose(): void;
     registerDecorationsProvider(provider: DecorationsProvider): Disposable;
     getDecoration(uri: URI, includeChildren: boolean): Decoration[];
+    protected notifyDecorationChange(uri: URI, decoration: Decoration | undefined): void;
+    protected notifyFlush(): void;
+    protected fireChangeEvent(): void;
 }
 //# sourceMappingURL=decorations-service.d.ts.map

package/lib/browser/decorations-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decorations-service.d.ts","sourceRoot":"","sources":["../../src/browser/decorations-service.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,iBAAiB,EAA2B,UAAU,EAAW,KAAK,EAAE,MAAM,WAAW,CAAC;AAEnG,OAAO,GAAG,MAAM,eAAe,CAAC;AAQhC,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;IACnC,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,iBAAiB,GAAG,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,GAAG,SAAS,CAAC;CACpH;AAED,MAAM,WAAW,UAAU;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,6BAA6B;IAC1C,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;CACtC;AACD,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,MAAM,WAAW,kBAAkB;IAE/B,QAAQ,CAAC,sBAAsB,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IAEhE,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,UAAU,CAAC;IAEvE,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,eAAe,EAAE,OAAO,GAAG,UAAU,EAAE,CAAC;CACnE;AAqHD,qBACa,sBAAuB,YAAW,kBAAkB;IAE7D,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAmC;IACxD,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAA0C;IAExF,QAAQ,CAAC,sBAAsB,iCAA4C;IAE3E,OAAO,IAAI,IAAI;IAIf,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,UAAU;IActE,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,eAAe,EAAE,OAAO,GAAG,UAAU,EAAE;CAalE"}
+{"version":3,"file":"decorations-service.d.ts","sourceRoot":"","sources":["../../src/browser/decorations-service.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,iBAAiB,EAA2B,UAAU,EAAW,KAAK,EAAE,MAAM,WAAW,CAAC;AAEnG,OAAO,GAAG,MAAM,eAAe,CAAC;AAShC,MAAM,WAAW,mBAAmB;IAChC;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC;IAC/C,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,iBAAiB,GAAG,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,GAAG,SAAS,CAAC;CACpH;AAED,MAAM,WAAW,UAAU;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,6BAA6B;IAC1C,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;CACtC;AACD,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,MAAM,WAAW,kBAAkB;IAE/B;;;;;;;;;OASG;IACH,QAAQ,CAAC,sBAAsB,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IAEhE,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,UAAU,CAAC;IAEvE,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,eAAe,EAAE,OAAO,GAAG,UAAU,EAAE,CAAC;CACnE;AAqLD,qBACa,sBAAuB,YAAW,kBAAkB;IAE7D,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAmC;IACxD,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAA0C;IAExF;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAC5E,OAAO,CAAC,YAAY,CAAS;IAE7B,QAAQ,CAAC,sBAAsB,iCAA4C;IAE3E,kEAAkE;IAClE,SAAS,CAAC,QAAQ,CAAC,QAAQ,6CAA6C;IAExE,OAAO,IAAI,IAAI;IAKf,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,UAAU;IAkBtE,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,eAAe,EAAE,OAAO,GAAG,UAAU,EAAE;IAc/D,SAAS,CAAC,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI;IAKpF,SAAS,CAAC,WAAW,IAAI,IAAI;IAK7B,SAAS,CAAC,eAAe,IAAI,IAAI;CAapC"}

package/lib/browser/decorations-service.js

@@ -21,61 +21,110 @@ const inversify_1 = require("inversify");
 const promise_util_1 = require("../common/promise-util");
 const common_1 = require("../common");
 const ternary_search_tree_1 = require("../common/ternary-search-tree");
+const debounce = require("lodash.debounce");
 exports.DecorationsService = Symbol('DecorationsService');
 class DecorationDataRequest {
-    constructor(source, thenable) {
+    constructor(source, thenable, 
+    /**
+     * Last settled decoration from before this request started. It is served while
+     * the request is in flight and used to detect removals when it resolves.
+     */
+    previous) {
         this.source = source;
         this.thenable = thenable;
+        this.previous = previous;
     }
 }
+/**
+ * A decoration that a flush event marked as possibly outdated. It is served until its
+ * resource is queried again, which triggers the re-fetch.
+ */
+class StaleDecoration {
+    constructor(value) {
+        this.value = value;
+    }
+}
+/**
+ * The decoration an entry last settled on: the resolved decoration itself, the
+ * pre-request value of an in-flight request, or the flushed value of a stale entry.
+ */
+function lastKnownDecoration(entry) {
+    if (entry instanceof DecorationDataRequest) {
+        return entry.previous;
+    }
+    if (entry instanceof StaleDecoration) {
+        return entry.value;
+    }
+    return entry ?? undefined;
+}
 class DecorationProviderWrapper {
-    constructor(provider, onDidChangeDecorationsEmitter) {
+    constructor(provider, 
+    /** Reports a changed decoration, or `undefined` when the decoration was removed. */
+    notifyDecorationChange, 
+    /** Reports that all decorations of this provider may have changed. */
+    notifyFlush) {
         this.provider = provider;
-        this.onDidChangeDecorationsEmitter = onDidChangeDecorationsEmitter;
-        this.decorations = new Map();
+        this.notifyDecorationChange = notifyDecorationChange;
+        this.notifyFlush = notifyFlush;
         this.data = ternary_search_tree_1.TernarySearchTree.forUris(true);
-        this.disposable = this.provider.onDidChange(async (uris) => {
-            this.decorations.clear();
+        this.disposable = this.provider.onDidChange(uris => {
             if (!uris) {
-                this.data.clear();
+                this.flush();
             }
             else {
+                // selective changes -> re-fetch the given resources
                 for (const uri of uris) {
                     this.fetchData(uri);
-                    const decoration = await provider.provideDecorations(uri, common_1.CancellationToken.None);
-                    if (decoration) {
-                        this.decorations.set(uri.toString(), decoration);
-                    }
                 }
             }
-            this.onDidChangeDecorationsEmitter.fire(this.decorations);
         });
     }
     dispose() {
         this.disposable.dispose();
         this.data.clear();
     }
-    knowsAbout(uri) {
-        return !!this.data.get(uri) || Boolean(this.data.findSuperstr(uri));
+    /**
+     * Handles a flush event: all cached data is dropped to be re-fetched on demand.
+     * Previously fetched decorations are kept as {@link StaleDecoration stale} values
+     * that are served until the re-fetch of their resource settles, so that displayed
+     * decorations do not blink out while the round trip is in flight.
+     */
+    flush() {
+        const stale = [];
+        this.data.forEach((value, key) => {
+            if (value instanceof DecorationDataRequest) {
+                value.source.cancel();
+            }
+            const decoration = lastKnownDecoration(value);
+            if (decoration) {
+                stale.push([key, new StaleDecoration(decoration)]);
+            }
+        });
+        this.data.clear();
+        for (const [key, value] of stale) {
+            this.data.set(key, value);
+        }
+        this.notifyFlush();
     }
     getOrRetrieve(uri, includeChildren, callback) {
         let item = this.data.get(uri);
-        if (item === undefined) {
-            // unknown -> trigger request
+        if (item === undefined || item instanceof StaleDecoration) {
+            // unknown or stale -> trigger request
             item = this.fetchData(uri);
         }
-        if (item && !(item instanceof DecorationDataRequest)) {
-            // found something (which isn't pending anymore)
-            callback(item, false);
+        // the result, or the last known decoration while a request is in flight
+        const decoration = lastKnownDecoration(item);
+        if (decoration) {
+            callback(decoration, false);
         }
         if (includeChildren) {
-            // (resolved) children
+            // (last known decorations of) children
             const iter = this.data.findSuperstr(uri);
             if (iter) {
                 let next = iter.next();
                 while (!next.done) {
-                    const value = next.value;
-                    if (value && !(value instanceof DecorationDataRequest)) {
+                    const value = lastKnownDecoration(next.value);
+                    if (value) {
                         callback(value, true);
                     }
                     next = iter.next();
@@ -84,36 +133,45 @@ class DecorationProviderWrapper {
         }
     }
     fetchData(uri) {
-        // check for pending request and cancel it
-        const pendingRequest = this.data.get(uri);
-        if (pendingRequest instanceof DecorationDataRequest) {
-            pendingRequest.source.cancel();
+        // check for pending request and cancel it, keeping the last settled value
+        const existing = this.data.get(uri);
+        const previous = lastKnownDecoration(existing);
+        if (existing instanceof DecorationDataRequest) {
+            existing.source.cancel();
             this.data.delete(uri);
         }
         const source = new common_1.CancellationTokenSource();
         const dataOrThenable = this.provider.provideDecorations(uri, source.token);
         if (!(0, promise_util_1.isThenable)(dataOrThenable)) {
             // sync -> we have a result now
-            return this.keepItem(uri, dataOrThenable);
+            return this.keepItem(uri, dataOrThenable, previous);
         }
         else {
             // async -> we have a result soon
             const request = new DecorationDataRequest(source, Promise.resolve(dataOrThenable).then(data => {
                 if (this.data.get(uri) === request) {
-                    this.keepItem(uri, data);
+                    this.keepItem(uri, data, request.previous);
                 }
             }).catch(err => {
                 if (!(err instanceof Error && err.name === 'Canceled' && err.message === 'Canceled') && this.data.get(uri) === request) {
                     this.data.delete(uri);
                 }
-            }));
+            }), previous);
             this.data.set(uri, request);
-            return undefined;
+            return request;
         }
     }
-    keepItem(uri, data) {
-        const deco = data ? data : undefined;
+    keepItem(uri, data, previous) {
+        // eslint-disable-next-line no-null/no-null
+        const deco = data ? data : null;
         this.data.set(uri, deco);
+        if (deco || previous) {
+            // only notify when something actually changed: a decoration appeared or
+            // changed, or a previously known decoration was removed. Resources resolving
+            // to "no decoration" from an unknown or pending state stay silent so that
+            // on-demand queries of undecorated resources cause no render churn.
+            this.notifyDecorationChange(uri, deco ?? undefined);
+        }
         return deco;
     }
 }
@@ -121,20 +179,29 @@ let DecorationsServiceImpl = class DecorationsServiceImpl {
     constructor() {
         this.data = [];
         this.onDidChangeDecorationsEmitter = new common_1.Emitter();
+        /**
+         * Accumulates decoration changes until the batched {@link onDidChangeDecorations}
+         * event fires. `undefined` values mark removed decorations.
+         */
+        this.pendingChanges = new Map();
+        this.pendingFlush = false;
         this.onDidChangeDecorations = this.onDidChangeDecorationsEmitter.event;
+        /** Coalesces all changes of the same tick into a single event. */
+        this.fireSoon = debounce(() => this.fireChangeEvent(), 0);
     }
     dispose() {
+        this.fireSoon.cancel();
         this.onDidChangeDecorationsEmitter.dispose();
     }
     registerDecorationsProvider(provider) {
-        const wrapper = new DecorationProviderWrapper(provider, this.onDidChangeDecorationsEmitter);
+        const wrapper = new DecorationProviderWrapper(provider, (uri, decoration) => this.notifyDecorationChange(uri, decoration), () => this.notifyFlush());
         this.data.push(wrapper);
         return common_1.Disposable.create(() => {
-            // fire event that says 'yes' for any resource
-            // known to this provider. then dispose and remove it.
+            // dispose and remove the provider, then signal that
+            // any of its previously provided decorations may be gone.
             this.data.splice(this.data.indexOf(wrapper), 1);
-            this.onDidChangeDecorationsEmitter.fire(new Map());
             wrapper.dispose();
+            this.notifyFlush();
         });
     }
     getDecoration(uri, includeChildren) {
@@ -150,6 +217,27 @@ let DecorationsServiceImpl = class DecorationsServiceImpl {
         }
         return data;
     }
+    notifyDecorationChange(uri, decoration) {
+        this.pendingChanges.set(uri.toString(), decoration);
+        this.fireSoon();
+    }
+    notifyFlush() {
+        this.pendingFlush = true;
+        this.fireSoon();
+    }
+    fireChangeEvent() {
+        const event = new Map();
+        if (!this.pendingFlush) {
+            for (const [uri, decoration] of this.pendingChanges) {
+                if (decoration) {
+                    event.set(uri, decoration);
+                }
+            }
+        }
+        this.pendingFlush = false;
+        this.pendingChanges.clear();
+        this.onDidChangeDecorationsEmitter.fire(event);
+    }
 };
 exports.DecorationsServiceImpl = DecorationsServiceImpl;
 exports.DecorationsServiceImpl = DecorationsServiceImpl = tslib_1.__decorate([

package/lib/browser/decorations-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorations-service.js","sourceRoot":"","sources":["../../src/browser/decorations-service.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,yCAAuC;AACvC,yDAAoD;AACpD,sCAAmG;AACnG,uEAAkE;AAyBrD,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAU/D,MAAM,qBAAqB;IACvB,YACa,MAA+B,EAC/B,QAAuB;QADvB,WAAM,GAAN,MAAM,CAAyB;QAC/B,aAAQ,GAAR,QAAQ,CAAe;IAChC,CAAC;CACR;AAED,MAAM,yBAAyB;IAM3B,YACa,QAA6B,EAC7B,6BAA+D;QAD/D,aAAQ,GAAR,QAAQ,CAAqB;QAC7B,kCAA6B,GAA7B,6BAA6B,CAAkC;QALnE,gBAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;QAQtD,IAAI,CAAC,IAAI,GAAG,uCAAiB,CAAC,OAAO,CAAiD,IAAI,CAAC,CAAC;QAE5F,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;YACrD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACtB,CAAC;iBAAM,CAAC;gBACJ,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;oBACrB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;oBACpB,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,GAAG,EAAE,0BAAiB,CAAC,IAAI,CAAC,CAAC;oBAClF,IAAI,UAAU,EAAE,CAAC;wBACb,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,CAAC;oBACrD,CAAC;gBACL,CAAC;YACL,CAAC;YACD,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACP,CAAC;IAED,OAAO;QACH,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAED,UAAU,CAAC,GAAQ;QACf,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,aAAa,CAAC,GAAQ,EAAE,eAAwB,EAAE,QAAsD;QAEpG,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAE9B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,6BAA6B;YAC7B,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC;QAED,IAAI,IAAI,IAAI,CAAC,CAAC,IAAI,YAAY,qBAAqB,CAAC,EAAE,CAAC;YACnD,gDAAgD;YAChD,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC1B,CAAC;QAED,IAAI,eAAe,EAAE,CAAC;YAClB,sBAAsB;YACtB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,IAAI,EAAE,CAAC;gBACP,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;gBACvB,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;oBAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;oBACzB,IAAI,KAAK,IAAI,CAAC,CAAC,KAAK,YAAY,qBAAqB,CAAC,EAAE,CAAC;wBACrD,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;oBAC1B,CAAC;oBACD,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;gBACvB,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAEO,SAAS,CAAC,GAAQ;QAEtB,0CAA0C;QAC1C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,cAAc,YAAY,qBAAqB,EAAE,CAAC;YAClD,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAC/B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,gCAAuB,EAAE,CAAC;QAC7C,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3E,IAAI,CAAC,IAAA,yBAAU,EAA2D,cAAc,CAAC,EAAE,CAAC;YACxF,+BAA+B;YAC/B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QAE9C,CAAC;aAAM,CAAC;YACJ,iCAAiC;YACjC,MAAM,OAAO,GAAG,IAAI,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC1F,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE,CAAC;oBACjC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBAC7B,CAAC;YACL,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBACX,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,IAAI,GAAG,CAAC,OAAO,KAAK,UAAU,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE,CAAC;oBACrH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC1B,CAAC;YACL,CAAC,CAAC,CAAC,CAAC;YAEJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC5B,OAAO,SAAS,CAAC;QACrB,CAAC;IACL,CAAC;IAEO,QAAQ,CAAC,GAAQ,EAAE,IAA4B;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAGM,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QAEc,SAAI,GAAgC,EAAE,CAAC;QACvC,kCAA6B,GAAG,IAAI,gBAAO,EAA2B,CAAC;QAE/E,2BAAsB,GAAG,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC;IAiC/E,CAAC;IA/BG,OAAO;QACH,IAAI,CAAC,6BAA6B,CAAC,OAAO,EAAE,CAAC;IACjD,CAAC;IAED,2BAA2B,CAAC,QAA6B;QAErD,MAAM,OAAO,GAAG,IAAI,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAC5F,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAExB,OAAO,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YAC1B,8CAA8C;YAC9C,sDAAsD;YACtD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;YAChD,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,GAAG,EAAsB,CAAC,CAAC;YACvE,OAAO,CAAC,OAAO,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,aAAa,CAAC,GAAQ,EAAE,eAAwB;QAC5C,MAAM,IAAI,GAAiB,EAAE,CAAC;QAC9B,IAAI,gBAAgB,GAAY,KAAK,CAAC;QACtC,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC9B,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;gBAC1D,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;oBAC1B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAChB,gBAAgB,GAAG,OAAO,IAAI,gBAAgB,CAAC;gBACnD,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AAtCY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAsClC"}
+{"version":3,"file":"decorations-service.js","sourceRoot":"","sources":["../../src/browser/decorations-service.ts"],"names":[],"mappings":"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"}

package/lib/browser/decorations-service.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=decorations-service.spec.d.ts.map

package/lib/browser/decorations-service.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"decorations-service.spec.d.ts","sourceRoot":"","sources":["../../src/browser/decorations-service.spec.ts"],"names":[],"mappings":""}

package/lib/browser/decorations-service.spec.js

@@ -0,0 +1,177 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2026 Safi Seid-Ahmad, K2view and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const common_1 = require("../common");
+const uri_1 = require("../common/uri");
+const decorations_service_1 = require("./decorations-service");
+class TestDecorationsProvider {
+    constructor() {
+        this.onDidChangeEmitter = new common_1.Emitter();
+        this.decorations = new Map();
+        this.queried = [];
+        this.asynchronous = true;
+    }
+    get onDidChange() {
+        return this.onDidChangeEmitter.event;
+    }
+    fireDidChange(uris) {
+        this.onDidChangeEmitter.fire(uris);
+    }
+    provideDecorations(uri, token) {
+        this.queried.push(uri.toString());
+        const decoration = this.decorations.get(uri.toString());
+        return this.asynchronous ? Promise.resolve(decoration) : decoration;
+    }
+}
+const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+describe('DecorationsServiceImpl', () => {
+    const uriA = new uri_1.default('file:///project/a.ts');
+    const uriB = new uri_1.default('file:///project/b.ts');
+    let service;
+    let provider;
+    let events;
+    beforeEach(() => {
+        service = new decorations_service_1.DecorationsServiceImpl();
+        provider = new TestDecorationsProvider();
+        service.registerDecorationsProvider(provider);
+        events = [];
+        service.onDidChangeDecorations(event => events.push(event));
+    });
+    afterEach(() => {
+        service.dispose();
+    });
+    it('resolves decorations of synchronous providers on first query', () => {
+        provider.asynchronous = false;
+        provider.decorations.set(uriA.toString(), { letter: 'M' });
+        const result = service.getDecoration(uriA, false);
+        (0, chai_1.expect)(result).to.have.lengthOf(1);
+        (0, chai_1.expect)(result[0].letter).to.equal('M');
+    });
+    it('caches "no decoration" results and does not query the provider again', async () => {
+        (0, chai_1.expect)(service.getDecoration(uriA, false)).to.have.lengthOf(0);
+        await sleep(20);
+        (0, chai_1.expect)(provider.queried).to.have.lengthOf(1);
+        (0, chai_1.expect)(service.getDecoration(uriA, false)).to.have.lengthOf(0);
+        await sleep(20);
+        (0, chai_1.expect)(provider.queried).to.have.lengthOf(1);
+    });
+    it('does not fire an event when an unknown resource resolves to no decoration', async () => {
+        service.getDecoration(uriA, false);
+        await sleep(20);
+        (0, chai_1.expect)(events).to.have.lengthOf(0);
+    });
+    it('fires a single batched event for resolutions of the same tick', async () => {
+        provider.decorations.set(uriA.toString(), { letter: 'A' });
+        provider.decorations.set(uriB.toString(), { letter: 'B' });
+        service.getDecoration(uriA, false);
+        service.getDecoration(uriB, false);
+        await sleep(20);
+        (0, chai_1.expect)(events).to.have.lengthOf(1);
+        (0, chai_1.expect)(events[0].get(uriA.toString())?.letter).to.equal('A');
+        (0, chai_1.expect)(events[0].get(uriB.toString())?.letter).to.equal('B');
+        const cached = service.getDecoration(uriA, false);
+        (0, chai_1.expect)(cached).to.have.lengthOf(1);
+        (0, chai_1.expect)(cached[0].letter).to.equal('A');
+    });
+    it('re-fetches a resource when the provider signals a change for it', async () => {
+        provider.decorations.set(uriA.toString(), { letter: 'A' });
+        service.getDecoration(uriA, false);
+        await sleep(20);
+        events.length = 0;
+        const queriesAfterWarmUp = provider.queried.length;
+        provider.decorations.set(uriA.toString(), { letter: 'D' });
+        provider.fireDidChange([uriA]);
+        await sleep(20);
+        (0, chai_1.expect)(provider.queried.length).to.be.greaterThan(queriesAfterWarmUp);
+        (0, chai_1.expect)(events).to.have.lengthOf(1);
+        (0, chai_1.expect)(events[0].get(uriA.toString())?.letter).to.equal('D');
+        (0, chai_1.expect)(service.getDecoration(uriA, false)[0].letter).to.equal('D');
+    });
+    it('fires an event when a decoration is removed', async () => {
+        provider.decorations.set(uriA.toString(), { letter: 'A' });
+        service.getDecoration(uriA, false);
+        await sleep(20);
+        events.length = 0;
+        provider.decorations.delete(uriA.toString());
+        provider.fireDidChange([uriA]);
+        await sleep(20);
+        (0, chai_1.expect)(events).to.have.lengthOf(1);
+        (0, chai_1.expect)(events[0].has(uriA.toString())).to.equal(false);
+        (0, chai_1.expect)(service.getDecoration(uriA, false)).to.have.lengthOf(0);
+    });
+    it('announces a removal that settles synchronously after a cancelled in-flight request', async () => {
+        provider.decorations.set(uriA.toString(), { letter: 'A' });
+        service.getDecoration(uriA, false);
+        await sleep(20);
+        events.length = 0;
+        // an async re-fetch is superseded by a synchronous one that removes the decoration
+        provider.fireDidChange([uriA]);
+        provider.asynchronous = false;
+        provider.decorations.delete(uriA.toString());
+        provider.fireDidChange([uriA]);
+        await sleep(20);
+        (0, chai_1.expect)(events).to.have.lengthOf(1);
+        (0, chai_1.expect)(events[0].has(uriA.toString())).to.equal(false);
+        (0, chai_1.expect)(service.getDecoration(uriA, false)).to.have.lengthOf(0);
+    });
+    it('keeps serving the previous decoration while a selective re-fetch is in flight', async () => {
+        provider.decorations.set(uriA.toString(), { letter: 'A' });
+        service.getDecoration(uriA, false);
+        await sleep(20);
+        provider.decorations.set(uriA.toString(), { letter: 'D' });
+        provider.fireDidChange([uriA]);
+        const whileInFlight = service.getDecoration(uriA, false);
+        (0, chai_1.expect)(whileInFlight).to.have.lengthOf(1);
+        (0, chai_1.expect)(whileInFlight[0].letter).to.equal('A');
+        await sleep(20);
+        (0, chai_1.expect)(service.getDecoration(uriA, false)[0].letter).to.equal('D');
+    });
+    it('keeps serving the last known decoration while a flush re-fetch is in flight', async () => {
+        provider.decorations.set(uriA.toString(), { letter: 'A' });
+        service.getDecoration(uriA, false);
+        await sleep(20);
+        provider.decorations.set(uriA.toString(), { letter: 'D' });
+        provider.fireDidChange(undefined);
+        await sleep(20);
+        // the first query after the flush triggers the re-fetch but serves the stale value
+        const whileInFlight = service.getDecoration(uriA, false);
+        (0, chai_1.expect)(whileInFlight).to.have.lengthOf(1);
+        (0, chai_1.expect)(whileInFlight[0].letter).to.equal('A');
+        await sleep(20);
+        (0, chai_1.expect)(service.getDecoration(uriA, false)[0].letter).to.equal('D');
+    });
+    it('drops all cached data on a flush event and re-fetches on demand', async () => {
+        provider.decorations.set(uriA.toString(), { letter: 'A' });
+        service.getDecoration(uriA, false);
+        service.getDecoration(uriB, false);
+        await sleep(20);
+        events.length = 0;
+        const queriesAfterWarmUp = provider.queried.length;
+        provider.fireDidChange(undefined);
+        await sleep(20);
+        // the flush itself announces an unspecified change with an empty payload
+        (0, chai_1.expect)(events).to.have.lengthOf(1);
+        (0, chai_1.expect)(events[0].size).to.equal(0);
+        service.getDecoration(uriA, false);
+        service.getDecoration(uriB, false);
+        await sleep(20);
+        (0, chai_1.expect)(provider.queried.length).to.equal(queriesAfterWarmUp + 2);
+        (0, chai_1.expect)(service.getDecoration(uriA, false)[0].letter).to.equal('A');
+    });
+});
+//# sourceMappingURL=decorations-service.spec.js.map

package/lib/browser/decorations-service.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"decorations-service.spec.js","sourceRoot":"","sources":["../../src/browser/decorations-service.spec.ts"],"names":[],"mappings":"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"}

package/lib/browser/hover-service.d.ts

@@ -6,6 +6,11 @@ import '../../src/browser/style/hover-service.css';
 export type HoverPosition = 'left' | 'right' | 'top' | 'bottom';
 export declare namespace HoverPosition {
     function invertIfNecessary(position: HoverPosition, target: DOMRect, host: DOMRect, totalWidth: number, totalHeight: number): HoverPosition;
+    /**
+     * Tests whether a hover of the given dimensions fits next to its target in the given
+     * position without extending beyond the window bounds.
+     */
+    function fits(position: HoverPosition, target: DOMRect, host: DOMRect, totalWidth: number, totalHeight: number): boolean;
 }
 export interface HoverRequest {
     content: string | MarkdownString | HTMLElement;
@@ -49,14 +54,40 @@ export declare class HoverService {
     protected readonly markdownRenderer: MarkdownRenderer;
     protected readonly openerService: OpenerService;
     protected _hoverHost: HTMLElement | undefined;
+    /**
+     * The host of the current hover, which may live in a secondary window's document.
+     * Resolving against the main document here instead would silently replace the host
+     * whenever the current hover lives in another document, detaching the dismissal
+     * listeners and `unRenderHover` from the host that is actually rendered.
+     */
     protected get hoverHost(): HTMLElement;
+    /**
+     * Returns the host element to render hovers into for the given document, creating it if the
+     * current one belongs to a different document. A host is always created in the document it is
+     * shown in: adopting a host into another document would let it outlive its window, and touching
+     * it after that window was closed breaks (and in Electron crashes) the application.
+     */
+    protected getOrCreateHoverHost(targetDocument: Document): HTMLElement;
     protected pendingTimeout: Disposable | undefined;
     protected hoverTarget: HTMLElement | undefined;
+    /** Identifies the latest render so that superseded renders can detect they are stale. */
+    protected renderSequence: number;
     protected lastHidHover: number;
     protected readonly disposeOnHide: DisposableCollection;
     requestHover(request: HoverRequest): void;
+    /**
+     * Cancels the hover when the window hosting the target element goes away, e.g. when the
+     * secondary window containing the target is closed: neither the hover host nor any listeners
+     * may outlive the document they belong to.
+     */
+    protected listenForWindowClose(target: HTMLElement): void;
     protected getHoverDelay(): number;
     protected renderHover(request: HoverRequest): Promise<void>;
+    /**
+     * Waits for an animation frame in the window hosting the given target element,
+     * which may be a secondary window whose rendering is independent of the main window's.
+     */
+    protected hostAnimationFrame(target: HTMLElement): Promise<void>;
     protected setHostPosition(target: HTMLElement, host: HTMLElement, position: HoverPosition): HoverPosition;
     protected listenForMouseOut(): void;
     cancelHover(): void;

package/lib/browser/hover-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hover-service.d.ts","sourceRoot":"","sources":["../../src/browser/hover-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAA4B,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC1G,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAG9E,OAAO,EAAwB,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAChG,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,2CAA2C,CAAC;AAEnD,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,QAAQ,CAAC;AAMhE,yBAAiB,aAAa,CAAC;IAC3B,SAAgB,iBAAiB,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,aAAa,CAmBjJ;CACJ;AAED,MAAM,WAAW,YAAY;IACzB,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW,CAAA;IAC9C,MAAM,EAAE,WAAW,CAAA;IACnB;;;;OAIG;IACH,QAAQ,EAAE,aAAa,CAAA;IACvB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,WAAW,GAAG,SAAS,CAAC;IAC3D;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,MAAM,CAAC,IAAI,IAAI,CAAC;IAChB;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,qBACa,YAAY;IACrB,SAAS,CAAC,MAAM,CAAC,aAAa,SAAiB;IAC/C,SAAS,CAAC,MAAM,CAAC,YAAY,SAAuB;IACzB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAI/C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAE7D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvE,SAAS,CAAC,UAAU,EAAE,WAAW,GAAG,SAAS,CAAC;IAC9C,SAAS,KAAK,SAAS,IAAI,WAAW,CAQrC;IACD,SAAS,CAAC,cAAc,EAAE,UAAU,GAAG,SAAS,CAAC;IACjD,SAAS,CAAC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/C,SAAS,CAAC,YAAY,SAAc;IACpC,SAAS,CAAC,QAAQ,CAAC,aAAa,uBAA8B;IAE9D,YAAY,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IASzC,SAAS,CAAC,aAAa,IAAI,MAAM;cAMjB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA2EjE,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,GAAG,aAAa;IAmCzG,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAkBnC,WAAW,IAAI,IAAI;IAOnB;;;;OAIG;IACH,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAa1D,SAAS,CAAC,aAAa,IAAI,IAAI;CAUlC"}
+{"version":3,"file":"hover-service.d.ts","sourceRoot":"","sources":["../../src/browser/hover-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAA4B,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC1G,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAG9E,OAAO,EAAwB,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAChG,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,2CAA2C,CAAC;AAEnD,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,QAAQ,CAAC;AAMhE,yBAAiB,aAAa,CAAC;IAC3B,SAAgB,iBAAiB,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,aAAa,CAmBjJ;IAED;;;OAGG;IACH,SAAgB,IAAI,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAU9H;CACJ;AAED,MAAM,WAAW,YAAY;IACzB,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW,CAAA;IAC9C,MAAM,EAAE,WAAW,CAAA;IACnB;;;;OAIG;IACH,QAAQ,EAAE,aAAa,CAAA;IACvB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,WAAW,GAAG,SAAS,CAAC;IAC3D;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,MAAM,CAAC,IAAI,IAAI,CAAC;IAChB;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,qBACa,YAAY;IACrB,SAAS,CAAC,MAAM,CAAC,aAAa,SAAiB;IAC/C,SAAS,CAAC,MAAM,CAAC,YAAY,SAAuB;IACzB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAI/C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAE7D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvE,SAAS,CAAC,UAAU,EAAE,WAAW,GAAG,SAAS,CAAC;IAC9C;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,WAAW,CAErC;IAED;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,CAAC,cAAc,EAAE,QAAQ,GAAG,WAAW;IASrE,SAAS,CAAC,cAAc,EAAE,UAAU,GAAG,SAAS,CAAC;IACjD,SAAS,CAAC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/C,yFAAyF;IACzF,SAAS,CAAC,cAAc,SAAK;IAC7B,SAAS,CAAC,YAAY,SAAc;IACpC,SAAS,CAAC,QAAQ,CAAC,aAAa,uBAA8B;IAE9D,YAAY,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAkBzC;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;IAUzD,SAAS,CAAC,aAAa,IAAI,MAAM;cAMjB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAyFjE;;;OAGG;IACH,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAQhE,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,GAAG,aAAa;IAqDzG,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAkBnC,WAAW,IAAI,IAAI;IAOnB;;;;OAIG;IACH,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAe1D,SAAS,CAAC,aAAa,IAAI,IAAI;CAiClC"}