Go through and check incorrect string in source code (#806)

* Go through and check incorrect string in source code
Fixes #797

* Go through and check incorrect string in source code
Fixes #797

* Update

* Update

Co-authored-by: EzioLi <v-yukl@microsoft.com>

.eslintrc.js

@@ -186,7 +186,7 @@ module.exports = {
                 cases: {
                     camelCase: true, // pascalCase: true,
                 },
-                ignore: [/rn-extension\.ts/],
+                ignore: [/cordova-extension\.ts/],
             },
         ],
         "unicorn/no-array-reduce": "warn",

gulp_scripts/cleaner.js

@@ -6,7 +6,7 @@ const clean = () => {
         "src/**/*.js.map",
         "out/",
         "dist",
-        "!test/resources/sampleReactNativeProject/**/*.js",
+        "!test/resources/testCordovaProject/**/*.js",
         ".vscode-test/",
         "src/**/*nls.*.json",
         "!test/smoke/**/*",

gulp_scripts/release.js

@@ -21,7 +21,7 @@ function prepareLicenses() {
         "package.json",
         "package-lock.json",
     ];
-    const backupFolder = path.resolve(path.join(os.tmpdir(), "vscode-react-native"));
+    const backupFolder = path.resolve(path.join(os.tmpdir(), "vscode-cordova"));
     if (!fs.existsSync(backupFolder)) {
         fs.mkdirSync(backupFolder);
     }
@@ -44,9 +44,9 @@ function prepareLicenses() {
         })
         .then(() => {
             let packageJson = readJson("/package.json");
-            packageJson.main = "/dist/rn-extension";
+            packageJson.main = "/dist/cordova-extension";
             if (isNightly) {
-                log("Performing gul release...");
+                log("Performing gulp release...");
                 packageJson.version = getVersionNumber();
                 packageJson.name = extensionName;
                 packageJson.preview = true;

gulp_scripts/webpackBundle.js

@@ -8,8 +8,8 @@ const distSrcDir = `${distDir}/src`;
 const webpackBundle = async () => {
     const packages = [
         {
-            entry: `${srcPath}/cordova.ts`,
-            filename: "rn-extension.js",
+            entry: `${srcPath}/extension/cordova-extension.ts`,
+            filename: "cordova-extension.js",
             library: true,
         },
     ];

package.json

@@ -46,7 +46,7 @@
 	"extensionKind": [
 		"workspace"
 	],
-	"main": "./src/cordova",
+	"main": "./src/extension/cordova-extension",
 	"contributes": {
 		"commands": [
 			{

src/extension/cordova-extension.ts

@@ -7,19 +7,19 @@ import { SimulateOptions } from "cordova-simulate";
 import * as vscode from "vscode";
 import * as semver from "semver";
 import * as nls from "vscode-nls";
-import { CordovaProjectHelper } from "./utils/cordovaProjectHelper";
-import { CordovaCommandHelper } from "./utils/cordovaCommandHelper";
-import { Telemetry } from "./utils/telemetry";
-import { TelemetryHelper } from "./utils/telemetryHelper";
-import { TsdHelper } from "./utils/tsdHelper";
-import { IonicCompletionProvider } from "./extension/completionProviders";
-import { CordovaSessionManager } from "./extension/cordovaSessionManager";
-import { ProjectsStorage } from "./extension/projectsStorage";
-import { PluginSimulator } from "./extension/simulate";
-import { CordovaDebugConfigProvider } from "./extension/debugConfigurationProvider";
-import { CordovaWorkspaceManager } from "./extension/cordovaWorkspaceManager";
-import customRequire from "./common/customRequire";
-import { findFileInFolderHierarchy } from "./utils/extensionHelper";
+import { CordovaProjectHelper } from "../utils/cordovaProjectHelper";
+import { CordovaCommandHelper } from "../utils/cordovaCommandHelper";
+import { Telemetry } from "../utils/telemetry";
+import { TelemetryHelper } from "../utils/telemetryHelper";
+import { TsdHelper } from "../utils/tsdHelper";
+import { IonicCompletionProvider } from "./completionProviders";
+import { CordovaSessionManager } from "./cordovaSessionManager";
+import { ProjectsStorage } from "./projectsStorage";
+import { PluginSimulator } from "./simulate";
+import { CordovaDebugConfigProvider } from "./debugConfigurationProvider";
+import { CordovaWorkspaceManager } from "./cordovaWorkspaceManager";
+import customRequire from "../common/customRequire";
+import { findFileInFolderHierarchy } from "../utils/extensionHelper";
 
 nls.config({
     messageFormat: nls.MessageFormat.bundle,

src/extension/cordovaWorkspaceManager.ts

@@ -7,7 +7,7 @@ import * as nls from "vscode-nls";
 import { SimulationInfo } from "../common/simulationInfo";
 import { ProjectType } from "../utils/cordovaProjectHelper";
 import { CordovaCommandHelper } from "../utils/cordovaCommandHelper";
-import { createAdditionalWorkspaceFolder, onFolderAdded } from "../cordova";
+import { createAdditionalWorkspaceFolder, onFolderAdded } from "./cordova-extension";
 import { ProjectsStorage } from "./projectsStorage";
 import { PluginSimulator } from "./simulate";
 import { ErrorHelper } from "../common/error/errorHelper";