Flatten some parts of the hierarchy

searchmarkers · Sep 9, 2024 · 420d52c · 420d52c
1 parent 4fe4445
commit 420d52c
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/src/content.mts b/src/content.mts
@@ -13,7 +13,7 @@ import { type MatchMode, MatchTerm, termEquals, TermTokens, TermPatterns } from
 import { EleID } from "/dist/modules/common.mjs";
 import { type AbstractEngineManager, EngineManager } from "/dist/modules/highlight/engine-manager.mjs";
 import { type AbstractToolbar, type ControlButtonName } from "/dist/modules/interface/toolbar.d.mjs";
-import { Toolbar } from "/dist/modules/interface/toolbars/toolbar.mjs";
+import { Toolbar } from "/dist/modules/interface/toolbar.mjs";
 import { assert, itemsMatch } from "/dist/modules/common.mjs";
 
 type GetToolbar<CreateIfNull extends boolean> = (CreateIfNull extends true

diff --git a/src/modules/highlight/engines/highlight.mts b/src/modules/highlight/engines/highlight.mts
@@ -6,7 +6,7 @@
 
 import type { AbstractTreeCacheEngine } from "/dist/modules/highlight/models/tree-cache.d.mjs";
 import type { AbstractFlowTracker, Flow, Span } from "/dist/modules/highlight/models/tree-cache/flow-tracker.d.mjs";
-import { FlowTracker } from "/dist/modules/highlight/models/tree-cache/flow-trackers/flow-tracker.mjs";
+import { FlowTracker } from "/dist/modules/highlight/models/tree-cache/flow-tracker.mjs";
 import * as TermCSS from "/dist/modules/highlight/term-css.mjs";
 import type { MatchTerm, TermTokens, TermPatterns } from "/dist/modules/match-term.mjs";
 import { StyleManager } from "/dist/modules/style-manager.mjs";

diff --git a/src/modules/highlight/engines/paint.mts b/src/modules/highlight/engines/paint.mts
@@ -8,7 +8,7 @@ import type { AbstractMethod } from "/dist/modules/highlight/engines/paint/metho
 import { getBoxesOwned } from "/dist/modules/highlight/engines/paint/boxes.mjs";
 import type { AbstractTreeCacheEngine } from "/dist/modules/highlight/models/tree-cache.d.mjs";
 import type { AbstractFlowTracker, Flow, Span } from "/dist/modules/highlight/models/tree-cache/flow-tracker.d.mjs";
-import { FlowTracker } from "/dist/modules/highlight/models/tree-cache/flow-trackers/flow-tracker.mjs";
+import { FlowTracker } from "/dist/modules/highlight/models/tree-cache/flow-tracker.mjs";
 import { highlightTags } from "/dist/modules/highlight/highlight-tags.mjs";
 import * as TermCSS from "/dist/modules/highlight/term-css.mjs";
 import type { MatchTerm, TermTokens, TermPatterns } from "/dist/modules/match-term.mjs";

diff --git a/...tree-cache/flow-trackers/flow-tracker.mts → ...hlight/models/tree-cache/flow-tracker.mts b/...tree-cache/flow-trackers/flow-tracker.mts → ...hlight/models/tree-cache/flow-tracker.mts
diff --git a/src/modules/interface/toolbars/toolbar.mts → src/modules/interface/toolbar.mts b/src/modules/interface/toolbars/toolbar.mts → src/modules/interface/toolbar.mts