|
5 | 5 | ViewColumn, |
6 | 6 | window, |
7 | 7 | workspace, |
| 8 | + WorkspaceFolder, |
8 | 9 | } from "vscode"; |
9 | 10 | import { AbstractWebview, WebviewPanelConfig } from "../abstract-webview"; |
10 | 11 | import { |
@@ -37,6 +38,19 @@ import { createDataExtensionYaml, loadDataExtensionYaml } from "./yaml"; |
37 | 38 | import { ExternalApiUsage } from "./external-api-usage"; |
38 | 39 | import { ModeledMethod } from "./modeled-method"; |
39 | 40 |
|
| 41 | +function getQlSubmoduleFolder(): WorkspaceFolder | undefined { |
| 42 | + const workspaceFolder = workspace.workspaceFolders?.find( |
| 43 | + (folder) => folder.name === "ql", |
| 44 | + ); |
| 45 | + if (!workspaceFolder) { |
| 46 | + void extLogger.log("No workspace folder 'ql' found"); |
| 47 | + |
| 48 | + return; |
| 49 | + } |
| 50 | + |
| 51 | + return workspaceFolder; |
| 52 | +} |
| 53 | + |
40 | 54 | export class DataExtensionsEditorView extends AbstractWebview< |
41 | 55 | ToDataExtensionsEditorMessage, |
42 | 56 | FromDataExtensionsEditorMessage |
@@ -245,12 +259,8 @@ export class DataExtensionsEditorView extends AbstractWebview< |
245 | 259 |
|
246 | 260 | await this.databaseManager.setCurrentDatabaseItem(selectedDatabase); |
247 | 261 |
|
248 | | - const workspaceFolder = workspace.workspaceFolders?.find( |
249 | | - (folder) => folder.name === "ql", |
250 | | - ); |
| 262 | + const workspaceFolder = getQlSubmoduleFolder(); |
251 | 263 | if (!workspaceFolder) { |
252 | | - void extLogger.log("No workspace folder 'ql' found"); |
253 | | - |
254 | 264 | return; |
255 | 265 | } |
256 | 266 |
|
@@ -404,12 +414,8 @@ export class DataExtensionsEditorView extends AbstractWebview< |
404 | 414 | } |
405 | 415 |
|
406 | 416 | private calculateModelFilename(): string | undefined { |
407 | | - const workspaceFolder = workspace.workspaceFolders?.find( |
408 | | - (folder) => folder.name === "ql", |
409 | | - ); |
| 417 | + const workspaceFolder = getQlSubmoduleFolder(); |
410 | 418 | if (!workspaceFolder) { |
411 | | - void extLogger.log("No workspace folder 'ql' found"); |
412 | | - |
413 | 419 | return; |
414 | 420 | } |
415 | 421 |
|
|
0 commit comments