Skip to content

Commit d334f6b

Browse files
committed
refactor: . Fix Statuses/StatusRegistryReport.ts > Statuses/StatusSettingsReport.ts cyclic dependency
1 parent c9cdd58 commit d334f6b

File tree

4 files changed

+17
-19
lines changed

4 files changed

+17
-19
lines changed

circular-deps.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Processed 152 files (1s) (16 warnings)
1+
Processed 152 files (995ms) (16 warnings)
22

33
1) Config/Settings.ts > Suggestor/Suggestor.ts
44
2) Task/Task.ts > Config/Settings.ts > Suggestor/Suggestor.ts
@@ -9,8 +9,7 @@ Processed 152 files (1s) (16 warnings)
99
7) Task/Task.ts > lib/LogTasksHelper.ts
1010
8) Query/Query.ts > Query/Explain/Explainer.ts
1111
9) Query/FilterParser.ts > Query/Filter/BooleanField.ts
12-
10) Statuses/StatusRegistryReport.ts > Statuses/StatusSettingsReport.ts
13-
11) main.ts > Config/SettingsTab.ts
14-
12) Obsidian/Cache.ts > Obsidian/TasksEvents.ts
15-
13) main.ts > Renderer/QueryRenderer.ts
12+
10) main.ts > Config/SettingsTab.ts
13+
11) Obsidian/Cache.ts > Obsidian/TasksEvents.ts
14+
12) main.ts > Renderer/QueryRenderer.ts
1615

src/Statuses/StatusRegistryReport.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,3 @@ ${settingsTable}
4747
These are the settings actually used by Tasks.
4848
${mermaidText}`;
4949
}
50-
51-
export function getPrintableSymbol(symbol: string) {
52-
// Do not put backticks around an empty symbol, as the two backticks are rendered
53-
// by Obsidian as ordinary characters and the meaning is unclear.
54-
// Better to just display nothing in this situation.
55-
if (symbol === '') {
56-
return symbol;
57-
}
58-
const result = symbol !== ' ' ? symbol : 'space';
59-
return '`' + result + '`';
60-
}

src/Statuses/StatusSettingsReport.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
import { StatusSettings } from '../Config/StatusSettings';
22
import { MarkdownTable } from '../lib/MarkdownTable';
33
import type { StatusConfiguration } from './StatusConfiguration';
4-
import { getPrintableSymbol } from './StatusRegistryReport';
5-
import { Status } from './Status';
64
import { StatusType } from './StatusConfiguration';
5+
import { Status } from './Status';
76

87
function getFirstIndex(statusConfigurations: StatusConfiguration[], wantedSymbol: string) {
98
return statusConfigurations.findIndex((s) => s.symbol === wantedSymbol);
109
}
1110

11+
export function getPrintableSymbol(symbol: string) {
12+
// Do not put backticks around an empty symbol, as the two backticks are rendered
13+
// by Obsidian as ordinary characters and the meaning is unclear.
14+
// Better to just display nothing in this situation.
15+
if (symbol === '') {
16+
return symbol;
17+
}
18+
const result = symbol !== ' ' ? symbol : 'space';
19+
return '`' + result + '`';
20+
}
21+
1222
function checkIfConventionalType(status: StatusConfiguration, problems: string[]) {
1323
// Check if conventional type is being used:
1424
const conventionalType = Status.getTypeForUnknownSymbol(status.symbol);

tests/TestingTools/VerifyStatuses.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { verify } from 'approvals/lib/Providers/Jest/JestApprovals';
2-
import { getPrintableSymbol } from '../../src/Statuses/StatusRegistryReport';
32
import type { Status } from '../../src/Statuses/Status';
43
import { MarkdownTable } from '../../src/lib/MarkdownTable';
54
import type { Task } from '../../src/Task/Task';
@@ -11,6 +10,7 @@ import { StatusField } from '../../src/Query/Filter/StatusField';
1110
import { StatusTypeField } from '../../src/Query/Filter/StatusTypeField';
1211
import { StatusNameField } from '../../src/Query/Filter/StatusNameField';
1312
import { StatusRegistry } from '../../src/Statuses/StatusRegistry';
13+
import { getPrintableSymbol } from '../../src/Statuses/StatusSettingsReport';
1414
import { TaskBuilder } from './TaskBuilder';
1515
import { verifyMarkdownForDocs } from './VerifyMarkdown';
1616
import { verifyWithFileExtension } from './ApprovalTestHelpers';

0 commit comments

Comments
 (0)