Move files to config folder

norascheuch · norascheuch · commit bd6c3add1b92 · 2022-11-16T10:22:54.000+01:00
diff --git a/extensions/ql-vscode/src/databases/config/db-config-store.ts b/extensions/ql-vscode/src/databases/config/db-config-store.ts
@@ -2,11 +2,11 @@ import * as fs from 'fs-extra';
 import * as path from 'path';
 import { cloneDbConfig, DbConfig } from './db-config';
 import * as chokidar from 'chokidar';
-import { DisposableObject } from '../pure/disposable-object';
+import { DisposableObject } from '../../pure/disposable-object';
 import { DbConfigValidator } from './db-config-validator';
-import { ValueResult } from '../common/value-result';
-import { App } from '../common/app';
-import { AppEvent, AppEventEmitter } from '../common/events';
+import { ValueResult } from '../../common/value-result';
+import { App } from '../../common/app';
+import { AppEvent, AppEventEmitter } from '../../common/events';
 
 export class DbConfigStore extends DisposableObject {
   public readonly onDidChangeConfig: AppEvent<void>;
diff --git a/extensions/ql-vscode/src/databases/config/db-config-validator.ts b/extensions/ql-vscode/src/databases/config/db-config-validator.ts
diff --git a/extensions/ql-vscode/src/databases/config/db-config.ts b/extensions/ql-vscode/src/databases/config/db-config.ts
diff --git a/extensions/ql-vscode/src/databases/db-manager.ts b/extensions/ql-vscode/src/databases/db-manager.ts
@@ -1,7 +1,7 @@
 import { App } from '../common/app';
 import { AppEvent, AppEventEmitter } from '../common/events';
 import { ValueResult } from '../common/value-result';
-import { DbConfigStore } from './db-config-store';
+import { DbConfigStore } from './config/db-config-store';
 import { DbItem } from './db-item';
 import { createLocalTree, createRemoteTree } from './db-tree-creator';
 
diff --git a/extensions/ql-vscode/src/databases/db-module.ts b/extensions/ql-vscode/src/databases/db-module.ts
@@ -2,7 +2,7 @@ import { App, AppMode } from '../common/app';
 import { isCanary, isNewQueryRunExperienceEnabled } from '../config';
 import { logger } from '../logging';
 import { DisposableObject } from '../pure/disposable-object';
-import { DbConfigStore } from './db-config-store';
+import { DbConfigStore } from './config/db-config-store';
 import { DbManager } from './db-manager';
 import { DbPanel } from './ui/db-panel';
 
diff --git a/extensions/ql-vscode/src/databases/db-tree-creator.ts b/extensions/ql-vscode/src/databases/db-tree-creator.ts
@@ -1,4 +1,4 @@
-import { DbConfig, RemoteRepositoryList } from './db-config';
+import { DbConfig, RemoteRepositoryList } from './config/db-config';
 import {
   DbItemKind,
   RemoteOwnerDbItem,
diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases/db-panel.test.ts b/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases/db-panel.test.ts
@@ -3,9 +3,9 @@ import { expect } from 'chai';
 import * as path from 'path';
 import * as fs from 'fs-extra';
 import * as pq from 'proxyquire';
-import { DbConfig } from '../../../databases/db-config';
+import { DbConfig } from '../../../databases/config/db-config';
 import { DbManager } from '../../../databases/db-manager';
-import { DbConfigStore } from '../../../databases/db-config-store';
+import { DbConfigStore } from '../../../databases/config/db-config-store';
 import { DbTreeDataProvider } from '../../../databases/ui/db-tree-data-provider';
 import { DbPanel } from '../../../databases/ui/db-panel';
 import { DbItemKind } from '../../../databases/db-item';
diff --git a/extensions/ql-vscode/test/pure-tests/databases/config/data/without-selected/workspace-databases.json b/extensions/ql-vscode/test/pure-tests/databases/config/data/without-selected/workspace-databases.json
diff --git a/extensions/ql-vscode/test/pure-tests/databases/config/data/workspace-databases.json b/extensions/ql-vscode/test/pure-tests/databases/config/data/workspace-databases.json
diff --git a/extensions/ql-vscode/test/pure-tests/databases/config/db-config-store.test.ts b/extensions/ql-vscode/test/pure-tests/databases/config/db-config-store.test.ts
@@ -1,11 +1,11 @@
 import * as fs from 'fs-extra';
 import * as path from 'path';
-import { DbConfigStore } from '../../../src/databases/db-config-store';
+import { DbConfigStore } from '../../../../src/databases/config/db-config-store';
 import { expect } from 'chai';
-import { createMockApp } from '../../__mocks__/appMock';
+import { createMockApp } from '../../../__mocks__/appMock';
 
 describe('db config store', async () => {
-  const extensionPath = path.join(__dirname, '../../..');
+  const extensionPath = path.join(__dirname, '../../../..');
   const tempWorkspaceStoragePath = path.join(__dirname, 'test-workspace');
   const testDataStoragePath = path.join(__dirname, 'data');
 
diff --git a/extensions/ql-vscode/test/pure-tests/databases/config/db-config-validator.test.ts b/extensions/ql-vscode/test/pure-tests/databases/config/db-config-validator.test.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import * as path from 'path';
-import { DbConfig } from '../../../src/databases/db-config';
-import { DbConfigValidator } from '../../../src/databases/db-config-validator';
+import { DbConfig } from '../../../../src/databases/config/db-config';
+import { DbConfigValidator } from '../../../../src/databases/config/db-config-validator';
 
 describe('db config validation', async () => {
   const extensionPath = path.join(__dirname, '../../..');
diff --git a/extensions/ql-vscode/test/pure-tests/databases/db-tree-creator.test.ts b/extensions/ql-vscode/test/pure-tests/databases/db-tree-creator.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { DbConfig } from '../../../src/databases/db-config';
+import { DbConfig } from '../../../src/databases/config/db-config';
 import { DbItemKind } from '../../../src/databases/db-item';
 import { createRemoteTree } from '../../../src/databases/db-tree-creator';
 
diff --git a/extensions/ql-vscode/test/tsconfig.json b/extensions/ql-vscode/test/tsconfig.json
@@ -5,6 +5,6 @@
   "compilerOptions": {
     "noEmit": true,
     "resolveJsonModule": true,
-    "rootDirs": [".", "../src"]
+    "rootDir": ".."
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { DbConfig, RemoteRepositoryList } from './db-config';`
	`1`	`+import { DbConfig, RemoteRepositoryList } from './config/db-config';`
`2`	`2`	`import {`
`3`	`3`	`DbItemKind,`
`4`	`4`	`RemoteOwnerDbItem,`