Rename AzureRMTools.ts -> extension.ts

extension.bundle.ts

@@ -21,7 +21,6 @@ import * as basic from "./src/language/json/Tokenizer";
 import * as Completion from './src/vscodeIntegration/Completion';
 
 export * from "./common";
-export { activateInternal, deactivateInternal } from './src/AzureRMTools'; // Export activate/deactivate for main.js
 export * from "./src/documents/DeploymentDocument";
 export * from "./src/documents/parameters/DeploymentFileMapping";
 export * from "./src/documents/parameters/DeploymentParametersDoc";
@@ -62,6 +61,7 @@ export * from "./src/documents/templates/UserFunctionMetadata";
 export * from "./src/documents/templates/UserFunctionNamespaceDefinition";
 export * from "./src/documents/templates/UserFunctionParameterDefinition";
 export * from "./src/documents/templates/VariableDefinition";
+export { activateInternal, deactivateInternal } from './src/extension'; // Export activate/deactivate for main.js
 export { ext } from './src/extensionVariables';
 export * from './src/language/expressions/AzureRMAssets';
 export * from "./src/language/expressions/friendlyExpressions";

main.js

@@ -18,7 +18,7 @@ let perfStats = {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const ignoreBundle = !/^(false|0)?$/i.test(process.env.AZCODE_ARM_IGNORE_BUNDLE || '');
-const extensionPath = ignoreBundle ? "./out/src/AzureRMTools.js" : "./dist/extension.bundle";
+const extensionPath = ignoreBundle ? "./out/src/extension.js" : "./dist/extension.bundle";
 const extension = require(extensionPath);
 
 async function activate(ctx) {

src/AzureRMTools.ts → src/extension.ts

@@ -118,7 +118,7 @@ export async function activateInternal(context: vscode.ExtensionContext, perfSta
 
             recordConfigValuesToTelemetry(actionContext);
 
-            context.subscriptions.push(new AzureRMTools(context));
+            context.subscriptions.push(new AzureRMToolsExtension(context));
         });
 
     } catch (err) {
@@ -158,7 +158,7 @@ export function deactivateInternal(): void {
     // Nothing to do
 }
 
-export class AzureRMTools implements IProvideOpenedDocuments {
+export class AzureRMToolsExtension implements IProvideOpenedDocuments {
     private readonly _diagnosticsCollection: vscode.DiagnosticCollection;
     // Key is normalized URI
     private readonly _deploymentDocuments: Map<string, DeploymentDocument> = new Map<string, DeploymentDocument>();
@@ -1286,8 +1286,8 @@ export class AzureRMTools implements IProvideOpenedDocuments {
                     incorrectArgCounts.add(encodedName);
                 }
             }
-            properties.unrecognized = AzureRMTools.convertSetToJson(unrecognized);
-            properties.incorrectArgs = AzureRMTools.convertSetToJson(incorrectArgCounts);
+            properties.unrecognized = AzureRMToolsExtension.convertSetToJson(unrecognized);
+            properties.incorrectArgs = AzureRMToolsExtension.convertSetToJson(incorrectArgCounts);
         });
     }
 
@@ -1369,7 +1369,7 @@ export class AzureRMTools implements IProvideOpenedDocuments {
             private _parameterValuesSource: CachedPromise<IParameterValuesSource> = new CachedPromise<IParameterValuesSource>();
 
             public constructor(
-                private readonly parent: AzureRMTools,
+                private readonly parent: AzureRMToolsExtension,
                 public readonly parameterFileUri: vscode.Uri) {
             }
 

test/support/typeInDocumentAndWait.ts

@@ -15,7 +15,7 @@ export async function typeInDocumentAndWait(editor: TextEditor, text: string): P
             // Not using the 'type' command because:
             //  1) Seems to be not 100% consistent
             //  2) It causes vscode to call provideCompletionItems, which causes interaction with
-            //      the triggerSuggest behavior in AzureRMTools.ts
+            //      the triggerSuggest behavior in extension.ts
 
             const initialPosition = editor.selection.anchor;
             let setPosition = initialPosition.translate(0, text.length);