format cmake-tools.ts (#2443)

src/drivers/cmakeDriver.ts

@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
 import * as api from '@cmt/api';
 import { CMakeExecutable } from '@cmt/cmake/cmake-executable';
 import * as codepages from '@cmt/code-pages';
-import { ConfigureTrigger } from "@cmt/cmake-tools";
+import { ConfigureTrigger } from "@cmt/cmakeTools";
 import { ArgsCompileCommand } from '@cmt/compdb';
 import { ConfigurationReader, defaultNumJobs } from '@cmt/config';
 import { CMakeBuildConsumer, CompileOutputConsumer } from '@cmt/diagnostics/build';

src/drivers/cmakeFileApiDriver.ts

@@ -1,5 +1,5 @@
 import * as api from '@cmt/api';
-import { ConfigureTrigger } from '@cmt/cmake-tools';
+import { ConfigureTrigger } from '@cmt/cmakeTools';
 import { ExecutableTarget } from '@cmt/api';
 import { CMakeCache } from '@cmt/cache';
 import { CMakeExecutable } from '@cmt/cmake/cmake-executable';

src/drivers/cmakeServerDriver.ts

@@ -1,6 +1,6 @@
 import { CMakeExecutable } from '@cmt/cmake/cmake-executable';
 import { InputFileSet } from '@cmt/dirty';
-import { ConfigureTrigger } from '@cmt/cmake-tools';
+import { ConfigureTrigger } from '@cmt/cmakeTools';
 import * as path from 'path';
 import * as vscode from 'vscode';
 

src/extension.ts

@@ -12,7 +12,7 @@ import * as cpt from 'vscode-cpptools';
 import * as nls from 'vscode-nls';
 
 import { CMakeCache } from '@cmt/cache';
-import { CMakeTools, ConfigureType, ConfigureTrigger } from '@cmt/cmake-tools';
+import { CMakeTools, ConfigureType, ConfigureTrigger } from '@cmt/cmakeTools';
 import { ConfigurationReader, TouchBarConfig } from '@cmt/config';
 import { CppConfigurationProvider, DiagnosticsCpptools } from '@cmt/cpptools';
 import { CMakeToolsFolderController, CMakeToolsFolder, DiagnosticsConfiguration, DiagnosticsSettings } from '@cmt/folders';

src/folders.ts

@@ -6,7 +6,7 @@ import * as nls from 'vscode-nls';
 import * as path from 'path';
 
 import * as util from '@cmt/util';
-import CMakeTools from '@cmt/cmake-tools';
+import CMakeTools from '@cmt/cmakeTools';
 import { KitsController } from '@cmt/kitsController';
 import rollbar from '@cmt/rollbar';
 import { disposeAll, setContextValue } from '@cmt/util';

src/kit.ts

@@ -10,7 +10,7 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import * as kitsController from '@cmt/kitsController';
 
-import CMakeTools from './cmake-tools';
+import CMakeTools from './cmakeTools';
 import * as expand from './expand';
 import { VSInstallation, vsInstallations, getHostTargetArchString, varsForVSInstallation, generatorPlatformFromVSArch } from './installs/visual-studio';
 import * as logging from './logging';

src/kitsController.ts

@@ -6,7 +6,7 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 
-import CMakeTools from '@cmt/cmake-tools';
+import CMakeTools from '@cmt/cmakeTools';
 import {
     Kit,
     descriptionForKit,

src/presetsController.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 
-import { CMakeTools } from '@cmt/cmake-tools';
+import { CMakeTools } from '@cmt/cmakeTools';
 import * as logging from '@cmt/logging';
 import { fs } from '@cmt/pr';
 import * as preset from '@cmt/preset';

test/extension-tests/multi-root-UI/test/debugger.test.ts

@@ -1,6 +1,6 @@
 import { DefaultEnvironment, expect, getFirstSystemKit } from '@test/util';
 import * as vscode from 'vscode';
-import CMakeTools from '@cmt/cmake-tools';
+import CMakeTools from '@cmt/cmakeTools';
 
 suite('Debug/Launch interface', async () => {
     let testEnv: DefaultEnvironment;

test/extension-tests/multi-root-UI/test/variant-envs.test.ts

@@ -4,7 +4,7 @@ import { clearExistingKitConfigurationFile, DefaultEnvironment, expect, getFirst
 import { fs } from '@cmt/pr';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import CMakeTools from '@cmt/cmake-tools';
+import CMakeTools from '@cmt/cmakeTools';
 
 suite('Environment Variables in Variants', async () => {
     let testEnv: DefaultEnvironment;

test/extension-tests/single-root-UI/test/configure-and-build-kits.test.ts

@@ -9,7 +9,7 @@ import {
 } from '@test/util';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import CMakeTools from '@cmt/cmake-tools';
+import CMakeTools from '@cmt/cmakeTools';
 
 const workername: string = process.platform;
 

test/extension-tests/single-root-UI/test/debugger-kits.test.ts

@@ -1,6 +1,6 @@
 import { DefaultEnvironment, expect, getFirstSystemKit } from '@test/util';
 import * as vscode from 'vscode';
-import CMakeTools from '@cmt/cmake-tools';
+import CMakeTools from '@cmt/cmakeTools';
 
 suite('Debug/Launch interface using Kits and Variants', async () => {
     let testEnv: DefaultEnvironment;

test/extension-tests/single-root-UI/test/envs-kits.test.ts

@@ -4,7 +4,7 @@ import { clearExistingKitConfigurationFile, DefaultEnvironment, expect, getFirst
 import { fs } from '@cmt/pr';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import CMakeTools from '@cmt/cmake-tools';
+import CMakeTools from '@cmt/cmakeTools';
 
 suite('Environment Variables in Variants', async () => {
     let testEnv: DefaultEnvironment;

test/extension-tests/successful-build/test/cmake.test.ts

@@ -1,4 +1,4 @@
-import { CMakeTools } from '@cmt/cmake-tools';
+import { CMakeTools } from '@cmt/cmakeTools';
 import { clearExistingKitConfigurationFile, DefaultEnvironment, expect, getFirstSystemKit } from '@test/util';
 
 suite('cmake', async () => {

test/extension-tests/successful-build/test/configure-and-build.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-expressions */
-import { CMakeTools, ConfigureTrigger } from '@cmt/cmake-tools';
+import { CMakeTools, ConfigureTrigger } from '@cmt/cmakeTools';
 import { fs } from '@cmt/pr';
 import { TestProgramResult } from '@test/helpers/testprogram/test-program-result';
 import { ExtensionConfigurationSettings } from '@cmt/config';

test/extension-tests/successful-build/test/debugger.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-expressions */
-import { CMakeTools } from '@cmt/cmake-tools';
+import { CMakeTools } from '@cmt/cmakeTools';
 import { DefaultEnvironment, expect, getFirstSystemKit } from '@test/util';
 //import sinon = require('sinon');
 import * as fs from 'fs';

test/extension-tests/successful-build/test/environment.test.ts

@@ -1,6 +1,6 @@
 import * as api from '@cmt/api';
 import { CMakeCache } from '@cmt/cache';
-import { CMakeTools } from '@cmt/cmake-tools';
+import { CMakeTools } from '@cmt/cmakeTools';
 import { clearExistingKitConfigurationFile, DefaultEnvironment, expect, getFirstSystemKit } from '@test/util';
 import * as path from 'path';
 

test/extension-tests/successful-build/test/toolchain.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-expressions */
 import * as api from '@cmt/api';
 import { CMakeCache } from '@cmt/cache';
-import { CMakeTools, ConfigureTrigger } from '@cmt/cmake-tools';
+import { CMakeTools, ConfigureTrigger } from '@cmt/cmakeTools';
 import { readKitsFile, kitsForWorkspaceDirectory, getAdditionalKits, USER_KITS_FILEPATH } from '@cmt/kit';
 import { platformNormalizePath } from '@cmt/util';
 import { DefaultEnvironment, expect } from '@test/util';

test/extension-tests/successful-build/test/variable-substitution.test.ts

@@ -1,6 +1,6 @@
 import * as api from '@cmt/api';
 import { CMakeCache } from '@cmt/cache';
-import { CMakeTools, ConfigureTrigger } from '@cmt/cmake-tools';
+import { CMakeTools, ConfigureTrigger } from '@cmt/cmakeTools';
 import paths from '@cmt/paths';
 import { objectPairs, platformNormalizePath, makeHashString } from '@cmt/util';
 import { clearExistingKitConfigurationFile, DefaultEnvironment, expect, getFirstSystemKit } from '@test/util';

test/extension-tests/successful-build/test/variant-envs.test.ts

@@ -2,7 +2,7 @@
 
 import * as api from '@cmt/api';
 import { CMakeCache } from '@cmt/cache';
-import { CMakeTools, ConfigureTrigger } from '@cmt/cmake-tools';
+import { CMakeTools, ConfigureTrigger } from '@cmt/cmakeTools';
 import { clearExistingKitConfigurationFile, DefaultEnvironment, expect, getFirstSystemKit } from '@test/util';
 import { fs } from '@cmt/pr';
 import * as path from 'path';

test/smoke/badProject/badProject.test.ts

@@ -1,4 +1,4 @@
-import { ConfigureTrigger } from '@cmt/cmake-tools';
+import { ConfigureTrigger } from '@cmt/cmakeTools';
 import { expect } from 'chai';
 
 import { smokeSuite, smokeTestDefaultKit } from '@test/smoke/smoke';

test/smoke/goodProject/goodProject.test.ts

@@ -1,4 +1,4 @@
-import { CMakeTools } from '@cmt/cmake-tools';
+import { CMakeTools } from '@cmt/cmakeTools';
 import { expect } from 'chai';
 
 import { smokeSuite, smokeTestDefaultKit } from '@test/smoke/smoke';

test/smoke/noCtest/noCtest.test.ts

@@ -1,4 +1,4 @@
-import { ConfigureTrigger } from '@cmt/cmake-tools';
+import { ConfigureTrigger } from '@cmt/cmakeTools';
 import { expect } from 'chai';
 import * as path from 'path';
 

test/smoke/smoke.ts

@@ -3,7 +3,7 @@ import { SmokeTestExtensionContext } from '@test/helpers/vscodefake/extensioncon
 
 import * as vscode from 'vscode';
 
-import { CMakeTools } from '@cmt/cmake-tools';
+import { CMakeTools } from '@cmt/cmakeTools';
 
 type Result<T> = Thenable<T> | T;
 

test/unit-tests/driver/driver-codemodel-tests.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-expressions */
 import { CMakeExecutable, getCMakeExecutableInformation } from '@cmt/cmake/cmake-executable';
 import { ConfigurationReader } from '@cmt/config';
-import { ConfigureTrigger } from '@cmt/cmake-tools';
+import { ConfigureTrigger } from '@cmt/cmakeTools';
 import * as codemodel_api from '@cmt/drivers/codemodel-driver-interface';
 import * as chai from 'chai';
 import { expect } from 'chai';

test/unit-tests/driver/driver-test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-unused-expressions */
 import { CMakeExecutable, getCMakeExecutableInformation } from '@cmt/cmake/cmake-executable';
-import { ConfigureTrigger } from '@cmt/cmake-tools';
+import { ConfigureTrigger } from '@cmt/cmakeTools';
 import { ConfigurationReader } from '@cmt/config';
 import * as chai from 'chai';
 import { expect } from 'chai';

test/unit-tests/kit-scan.test.ts

@@ -10,7 +10,7 @@ import * as kit from '../../src/kit';
 import * as triple from '../../src/triple';
 import { fs } from '../../src/pr';
 
-import { CMakeTools } from '@cmt/cmake-tools';
+import { CMakeTools } from '@cmt/cmakeTools';
 import { clearExistingKitConfigurationFile, DefaultEnvironment } from '@test/util';
 
 const here = __dirname;

test/util.ts

@@ -1,4 +1,4 @@
-import { CMakeTools } from '@cmt/cmake-tools';
+import { CMakeTools } from '@cmt/cmakeTools';
 import { Kit, scanForKits, kitsForWorkspaceDirectory } from '@cmt/kit';
 import paths from '@cmt/paths';
 import { fs } from '@cmt/pr';