Skip to content

Commit dde417e

Browse files
committed
Start model editor in framework mode for Ruby
1 parent b023431 commit dde417e

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
export * from "./initial-mode";
12
export * from "./languages";
23
export * from "./models-as-data";
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { QueryLanguage } from "../../common/query-language";
2+
import { INITIAL_MODE, Mode } from "../shared/mode";
3+
4+
export function getInitialMode(language: QueryLanguage): Mode {
5+
if (language === QueryLanguage.Ruby) {
6+
return Mode.Framework;
7+
}
8+
9+
return INITIAL_MODE;
10+
}

extensions/ql-vscode/src/model-editor/model-editor-module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import { showResolvableLocation } from "../databases/local-databases/locations";
2222
import { ModelEditorViewTracker } from "./model-editor-view-tracker";
2323
import { ModelConfigListener } from "../config";
2424
import { ModelingEvents } from "./modeling-events";
25+
import { getInitialMode } from "./languages";
2526

2627
const SUPPORTED_LANGUAGES: string[] = ["java", "csharp"];
2728

@@ -237,6 +238,7 @@ export class ModelEditorModule extends DisposableObject {
237238
db,
238239
modelFile,
239240
language,
241+
getInitialMode(language),
240242
);
241243

242244
this.modelingEvents.onDbClosed(async (dbUri) => {

extensions/ql-vscode/src/model-editor/model-editor-view.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import { Method } from "./method";
3838
import { ModeledMethod } from "./modeled-method";
3939
import { ExtensionPack } from "./shared/extension-pack";
4040
import { ModelConfigListener } from "../config";
41-
import { INITIAL_MODE, Mode } from "./shared/mode";
41+
import { Mode } from "./shared/mode";
4242
import { loadModeledMethods, saveModeledMethods } from "./modeled-method-fs";
4343
import { pickExtensionPack } from "./extension-pack-picker";
4444
import {
@@ -72,7 +72,7 @@ export class ModelEditorView extends AbstractWebview<
7272
private readonly extensionPack: ExtensionPack,
7373
// The language is equal to databaseItem.language but is properly typed as QueryLanguage
7474
private readonly language: QueryLanguage,
75-
initialMode: Mode = INITIAL_MODE,
75+
initialMode: Mode,
7676
) {
7777
super(app);
7878

extensions/ql-vscode/src/model-editor/modeling-store.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Method, Usage } from "./method";
44
import { ModeledMethod } from "./modeled-method";
55
import { ModelingEvents } from "./modeling-events";
66
import { INITIAL_HIDE_MODELED_METHODS_VALUE } from "./shared/hide-modeled-methods";
7-
import { INITIAL_MODE, Mode } from "./shared/mode";
7+
import { Mode } from "./shared/mode";
88

99
interface InternalDbModelingState {
1010
databaseItem: DatabaseItem;
@@ -50,10 +50,7 @@ export class ModelingStore extends DisposableObject {
5050
this.state = new Map<string, InternalDbModelingState>();
5151
}
5252

53-
public initializeStateForDb(
54-
databaseItem: DatabaseItem,
55-
mode: Mode = INITIAL_MODE,
56-
) {
53+
public initializeStateForDb(databaseItem: DatabaseItem, mode: Mode) {
5754
const dbUri = databaseItem.databaseUri.toString();
5855
this.state.set(dbUri, {
5956
databaseItem,

0 commit comments

Comments
 (0)