mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #3039 from github/charisk/method-modeling-language

Browse Source 
Update method modeling panel language when new db opened
This commit is contained in:
Charis Kyriakou
2023-11-01 09:31:53 +00:00
committed by GitHub
parent 6685883ebf 57fbb8e2e6
commit fe212c315c
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/ql-vscode/src/model-editor/method-modeling/method-modeling-view-provider.ts
View File

@@ -208,11 +208,16 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
);
this.push(
this.modelingEvents.onDbOpened(async () => {
this.modelingEvents.onDbOpened(async (databaseItem) => {
this.databaseItem = databaseItem;
await this.postMessage({
t: "setInModelingMode",
inModelingMode: true,
});
this.language = tryGetQueryLanguage(databaseItem.language);
await this.setViewState();
}),
);

12
extensions/ql-vscode/src/model-editor/modeling-events.ts
View File

@@ -50,7 +50,7 @@ interface InProgressMethodsChangedEvent {
export class ModelingEvents extends DisposableObject {
public readonly onActiveDbChanged: AppEvent<void>;
public readonly onDbOpened: AppEvent<string>;
public readonly onDbOpened: AppEvent<DatabaseItem>;
public readonly onDbClosed: AppEvent<string>;
public readonly onMethodsChanged: AppEvent<MethodsChangedEvent>;
public readonly onHideModeledMethodsChanged: AppEvent<HideModeledMethodsChangedEvent>;
@@ -61,7 +61,7 @@ export class ModelingEvents extends DisposableObject {
public readonly onInProgressMethodsChanged: AppEvent<InProgressMethodsChangedEvent>;
private readonly onActiveDbChangedEventEmitter: AppEventEmitter<void>;
private readonly onDbOpenedEventEmitter: AppEventEmitter<string>;
private readonly onDbOpenedEventEmitter: AppEventEmitter<DatabaseItem>;
private readonly onDbClosedEventEmitter: AppEventEmitter<string>;
private readonly onMethodsChangedEventEmitter: AppEventEmitter<MethodsChangedEvent>;
private readonly onHideModeledMethodsChangedEventEmitter: AppEventEmitter<HideModeledMethodsChangedEvent>;
@@ -79,7 +79,9 @@ export class ModelingEvents extends DisposableObject {
);
this.onActiveDbChanged = this.onActiveDbChangedEventEmitter.event;
this.onDbOpenedEventEmitter = this.push(app.createEventEmitter<string>());
this.onDbOpenedEventEmitter = this.push(
app.createEventEmitter<DatabaseItem>(),
);
this.onDbOpened = this.onDbOpenedEventEmitter.event;
this.onDbClosedEventEmitter = this.push(app.createEventEmitter<string>());
@@ -130,8 +132,8 @@ export class ModelingEvents extends DisposableObject {
this.onActiveDbChangedEventEmitter.fire();
}
public fireDbOpenedEvent(dbUri: string) {
this.onDbOpenedEventEmitter.fire(dbUri);
public fireDbOpenedEvent(databaseItem: DatabaseItem) {
this.onDbOpenedEventEmitter.fire(databaseItem);
}
public fireDbClosedEvent(dbUri: string) {

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

@@ -64,7 +64,7 @@ export class ModelingStore extends DisposableObject {
inProgressMethods: new Set(),
});
this.modelingEvents.fireDbOpenedEvent(dbUri);
this.modelingEvents.fireDbOpenedEvent(databaseItem);
}
public setActiveDb(databaseItem: DatabaseItem) {