Make python a constant

microsoft · Mar 5, 2020 · de43ea6 · de43ea6
1 parent b812b59
commit de43ea6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/constants.ts b/src/constants.ts
@@ -465,5 +465,8 @@ export const HELPER_FILES = {
 export const GLOBAL_ENV_VARS = {
     PYTHON: "python",
 };
+export const LANGUAGE_VARS = {
+    PYTHON: { ID: "python", FILE_ENDS: ".py" },
+};
 
 export default CONSTANTS;
diff --git a/src/extension.ts b/src/extension.ts
@@ -18,6 +18,7 @@ import {
     HELPER_FILES,
     SERVER_INFO,
     TelemetryEventName,
+    LANGUAGE_VARS,
 } from "./constants";
 import { CPXWorkspace } from "./cpxWorkspace";
 import { DebugAdapterFactory } from "./debugger/debugAdapterFactory";
@@ -387,7 +388,10 @@ export async function activate(context: vscode.ExtensionContext) {
 
         // tslint:disable-next-line: ban-comma-operator
         vscode.workspace
-            .openTextDocument({ content: file, language: "python" })
+            .openTextDocument({
+                content: file,
+                language: LANGUAGE_VARS.PYTHON.ID,
+            })
             .then((template: vscode.TextDocument) => {
                 vscode.window.showTextDocument(template, 1, false).then(() => {
                     openWebview();
@@ -516,7 +520,7 @@ export async function activate(context: vscode.ExtensionContext) {
             if (
                 !fileSelectionService
                     .getCurrentTextDocument()
-                    .fileName.endsWith(".py")
+                    .fileName.endsWith(LANGUAGE_VARS.PYTHON.FILE_ENDS)
             ) {
                 utils.logToOutputChannel(
                     outChannel,
@@ -654,8 +658,6 @@ export async function activate(context: vscode.ExtensionContext) {
     );
 
     const deployCode = async (device: string) => {
-        console.info(`Sending code to ${device}`);
-
         utils.logToOutputChannel(
             outChannel,
             CONSTANTS.INFO.DEPLOY_DEVICE,
@@ -944,7 +946,7 @@ export async function activate(context: vscode.ExtensionContext) {
         debuggerCommunicationService
     );
     vscode.debug.registerDebugAdapterTrackerFactory(
-        "python",
+        LANGUAGE_VARS.PYTHON.ID,
         debugAdapterFactory
     );
     // On Debug Session Start: Init comunication

diff --git a/src/service/fileSelectionService.ts b/src/service/fileSelectionService.ts
@@ -2,6 +2,7 @@ import * as vscode from "vscode";
 import { VSCODE_MESSAGES_TO_WEBVIEW } from "../view/constants";
 import { DeviceSelectionService } from "./deviceSelectionService";
 import { MessagingService } from "./messagingService";
+import { LANGUAGE_VARS } from "../constants";
 
 export class FileSelectionService {
     private currentFileAbsPath: string = "";
@@ -84,7 +85,7 @@ export class FileSelectionService {
     private getActivePythonFile = () => {
         const editors: vscode.TextEditor[] = vscode.window.visibleTextEditors;
         const activeEditor = editors.find(
-            editor => editor.document.languageId === "python"
+            editor => editor.document.languageId === LANGUAGE_VARS.PYTHON.ID
         );
         if (activeEditor) {
             this.currentTextDocument = activeEditor.document;