Skip to content

Commit 42192fa

Browse files
authored
Move modeling status code to its own module (#2866)
* Move ModelingStatus to its own file * Move getModelingStatus to modeling status module
1 parent 947084d commit 42192fa

File tree

5 files changed

+23
-25
lines changed

5 files changed

+23
-25
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { ModeledMethod } from "../modeled-method";
2+
3+
export type ModelingStatus = "unmodeled" | "unsaved" | "saved";
4+
5+
export function getModelingStatus(
6+
modeledMethod: ModeledMethod | undefined,
7+
methodIsUnsaved: boolean,
8+
): ModelingStatus {
9+
if (modeledMethod) {
10+
if (methodIsUnsaved) {
11+
return "unsaved";
12+
} else if (modeledMethod.type !== "none") {
13+
return "saved";
14+
}
15+
}
16+
return "unmodeled";
17+
}

extensions/ql-vscode/src/view/method-modeling/MethodModeling.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import * as React from "react";
22
import { styled } from "styled-components";
3-
import {
4-
ModelingStatus,
5-
ModelingStatusIndicator,
6-
} from "../model-editor/ModelingStatusIndicator";
3+
import { ModelingStatus } from "../../model-editor/shared/modeling-status";
4+
import { ModelingStatusIndicator } from "../model-editor/ModelingStatusIndicator";
75
import { Method } from "../../model-editor/method";
86
import { MethodName } from "../model-editor/MethodName";
97
import { ModeledMethod } from "../../model-editor/modeled-method";

extensions/ql-vscode/src/view/method-modeling/MethodModelingView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from "react";
22
import { useEffect, useState } from "react";
33
import { MethodModeling } from "./MethodModeling";
4-
import { ModelingStatus } from "../model-editor/ModelingStatusIndicator";
4+
import { ModelingStatus } from "../../model-editor/shared/modeling-status";
55
import { Method } from "../../model-editor/method";
66
import { ToMethodModelingMessage } from "../../common/interface-types";
77
import { assertNever } from "../../common/helpers-pure";

extensions/ql-vscode/src/view/model-editor/MethodRow.tsx

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ import { ModeledMethod } from "../../model-editor/modeled-method";
1414
import { ModelKindDropdown } from "./ModelKindDropdown";
1515
import { Mode } from "../../model-editor/shared/mode";
1616
import { MethodClassifications } from "./MethodClassifications";
17-
import {
18-
ModelingStatus,
19-
ModelingStatusIndicator,
20-
} from "./ModelingStatusIndicator";
17+
import { getModelingStatus } from "../../model-editor/shared/modeling-status";
18+
import { ModelingStatusIndicator } from "./ModelingStatusIndicator";
2119
import { InProgressDropdown } from "./InProgressDropdown";
2220
import { MethodName } from "./MethodName";
2321
import { ModelTypeDropdown } from "./ModelTypeDropdown";
@@ -181,17 +179,3 @@ function sendJumpToUsageMessage(method: Method) {
181179
usage: method.usages[0],
182180
});
183181
}
184-
185-
function getModelingStatus(
186-
modeledMethod: ModeledMethod | undefined,
187-
methodIsUnsaved: boolean,
188-
): ModelingStatus {
189-
if (modeledMethod) {
190-
if (methodIsUnsaved) {
191-
return "unsaved";
192-
} else if (modeledMethod.type !== "none") {
193-
return "saved";
194-
}
195-
}
196-
return "unmodeled";
197-
}

extensions/ql-vscode/src/view/model-editor/ModelingStatusIndicator.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import * as React from "react";
22
import { assertNever } from "../../common/helpers-pure";
33
import { Codicon } from "../common/icon/Codicon";
4-
5-
export type ModelingStatus = "unmodeled" | "unsaved" | "saved";
4+
import { ModelingStatus } from "../../model-editor/shared/modeling-status";
65

76
interface Props {
87
status: ModelingStatus;

0 commit comments

Comments
 (0)