Merge branch 'master' into fix-163

Author: gjsjohnmurray

.eslintignore

@@ -0,0 +1,2 @@
+vscode.d.ts
+vscode.proposed.d.ts

.github/workflows/main.yml

@@ -15,6 +15,7 @@ on:
       - created
 jobs:
   build:
+    timeout-minutes: 10
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -48,6 +49,9 @@ jobs:
       with:
         node-version: 12.x
     - run: npm install
+    - name: lint
+      if: runner.os == 'Linux'
+      run: npm run lint
     - run: npm run compile
     - name: npm test
       uses: GabrielBB/xvfb-action@v1.0

.gitignore

@@ -2,6 +2,8 @@ node_modules/
 .idea
 *.iml
 .vscode/**
-.vscode-test
-out
+.vscode-test/
+out/
+dist/
 *.vsix
+vscode*.d.ts

.vscodeignore

@@ -1,9 +1,14 @@
+.github/**
 .vscode/**
 .vscode-test/**
-typings/**
-out/test/**
-test/**
-# src/**
-# **/*.map
+out/
+src/
+**/*.ts
+**/*.map
+**/*.cls
 .gitignore
-tsconfig.json
+tsconfig*.json
+**/tslint.json
+**/.eslintrc.json
+node_modules/
+webpack.config.js

package-lock.json

@@ -39,7 +39,7 @@
     }
   ],
   "engines": {
-    "vscode": "^1.41.0"
+    "vscode": "^1.46.0"
   },
   "enableProposedApi": true,
   "activationEvents": [
@@ -63,7 +63,7 @@
     "onFileSystem:objectscript",
     "onDebugInitialConfigurations"
   ],
-  "main": "./out/extension",
+  "main": "./dist/extension",
   "contributes": {
     "menus": {
       "commandPalette": [
@@ -728,56 +728,64 @@
     ]
   },
   "scripts": {
-    "vscode:prepublish": "npm run compile",
+    "vscode:prepublish": "webpack --mode production",
+    "webpack": "webpack --mode development",
+    "webpack-dev": "webpack --mode development --watch",
     "package": "vsce package",
-    "compile": "tsc -p ./",
+    "compile": "webpack --mode production && tsc -p ./",
     "watch": "tsc -w -p ./tsconfig.json",
     "pretest": "npm run compile",
     "test": "node ./out/test/runTest.js",
-    "lint": "node ./node_modules/tslint/bin/tslint --project tsconfig.json -t verbose",
-    "lint-fix": "tslint --project tsconfig.json -t verbose --fix"
+    "lint": "eslint src/**",
+    "lint-fix": "eslint --fix src/**",
+    "download-api": "vscode-dts dev",
+    "postdownload-api": "vscode-dts master",
+    "postinstall": "npm run download-api"
   },
   "devDependencies": {
-    "@types/glob": "^7.1.1",
-    "@types/mocha": "^5.2.7",
-    "@types/node": "^12.12.26",
-    "@types/request": "^2.48.4",
-    "@types/request-promise": "^4.1.45",
-    "@types/vscode": "^1.41.0",
-    "@types/ws": "^6.0.4",
+    "@types/glob": "^7.1.2",
+    "@types/mocha": "^7.0.2",
+    "@types/node": "^14.0.14",
+    "@types/request": "^2.48.5",
+    "@types/request-promise": "^4.1.46",
+    "@types/ws": "^7.2.5",
     "@types/xmldom": "^0.1.29",
-    "@typescript-eslint/eslint-plugin": "^2.19.0",
-    "@typescript-eslint/parser": "^2.19.0",
-    "eslint": "^6.8.0",
-    "eslint-config-airbnb": "^18.0.1",
-    "eslint-config-prettier": "^6.10.0",
-    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-node": "^10.0.0",
-    "eslint-plugin-prettier": "^3.1.2",
+    "@typescript-eslint/eslint-plugin": "^3.4.0",
+    "@typescript-eslint/parser": "^3.4.0",
+    "eslint": "^7.3.1",
+    "eslint-config-airbnb": "^18.2.0",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-import": "^2.21.2",
+    "eslint-plugin-jsx-a11y": "^6.3.1",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-promise": "^4.2.1",
     "extend": "^3.0.2",
-    "minimist": ">=1.2.2",
-    "mocha": "^6.2.2",
-    "prettier": "^1.19.1",
-    "tape": "^4.13.0",
-    "typescript": "^3.7.5",
-    "vsce": "^1.73.0",
-    "vscode-debugadapter-testsupport": "^1.40.1",
-    "vscode-test": "^1.3.0"
+    "minimist": ">=1.2.5",
+    "mocha": "^8.0.1",
+    "prettier": "^2.0.5",
+    "tape": "^5.0.1",
+    "ts-loader": "^7.0.5",
+    "typescript": "^3.9.5",
+    "vsce": "^1.77.0",
+    "vscode-debugadapter-testsupport": "^1.41.0",
+    "vscode-dts": "^0.3.1",
+    "vscode-test": "^1.4.0",
+    "webpack": "^4.43.0",
+    "webpack-cli": "^3.3.12"
   },
   "dependencies": {
     "await-notify": "^1.0.1",
     "glob": "^7.1.6",
-    "iconv-lite": "^0.5.1",
-    "mkdirp": "^1.0.3",
-    "request": "^2.88.0",
+    "iconv-lite": "^0.6.0",
+    "mkdirp": "^1.0.4",
+    "request": "^2.88.2",
     "request-promise": "^4.2.5",
     "vscode-cache": "^0.3.0",
-    "vscode-debugadapter": "^1.39.1",
-    "vscode-debugprotocol": "^1.39.0",
-    "vscode-extension-telemetry": "^0.1.2",
-    "ws": "^7.2.1",
-    "xmldom": "^0.1.31"
+    "vscode-debugadapter": "^1.41.0",
+    "vscode-debugprotocol": "^1.41.0",
+    "vscode-extension-telemetry": "^0.1.6",
+    "ws": "^7.3.0",
+    "xmldom": "^0.3.0"
   }
 }

package.json

@@ -72,9 +72,9 @@ export class AtelierAPI {
 
   public updateCookies(newCookies: string[]): Promise<any> {
     const cookies = this.cache.get("cookies", []);
-    newCookies.forEach(cookie => {
+    newCookies.forEach((cookie) => {
       const [cookieName] = cookie.split("=");
-      const index = cookies.findIndex(el => el.startsWith(cookieName));
+      const index = cookies.findIndex((el) => el.startsWith(cookieName));
       if (index >= 0) {
         cookies[index] = cookie;
       } else {
@@ -123,7 +123,7 @@ export class AtelierAPI {
         return "";
       }
       const result = [];
-      Object.keys(params).forEach(key => {
+      Object.keys(params).forEach((key) => {
         const value = params[key];
         if (typeof value === "boolean") {
           result.push(`${key}=${value ? "1" : "0"}`);
@@ -156,7 +156,7 @@ export class AtelierAPI {
       auth = this.request(0, "HEAD");
     }
     const connInfo = `${host}:${port}[${this.ns}]`;
-    return auth.then(cookie => {
+    return auth.then((cookie) => {
       return (
         request({
           agent,
@@ -173,8 +173,8 @@ export class AtelierAPI {
           uri: `${proto}://${host}:${port}${path}`,
         })
           // .catch(error => error.error)
-          .then(response => this.updateCookies(response.headers["set-cookie"]).then(() => response))
-          .then(response => {
+          .then((response) => this.updateCookies(response.headers["set-cookie"]).then(() => response))
+          .then((response) => {
             panel.text = `${connInfo} - Connected`;
             // console.log(`APIResponse: ${method} ${proto}://${host}:${port}${path}`)
             if (method === "HEAD") {
@@ -188,18 +188,19 @@ export class AtelierAPI {
             }
             if (data.console) {
               // Let studio actions handle their console output
-              const isStudioAction = data.result.content != undefined
-                && data.result.content.length !== 0
-                && data.result.content[0] != undefined
-                && data.result.content[0].action != undefined;
-              if(!isStudioAction) {
+              const isStudioAction =
+                data.result.content != undefined &&
+                data.result.content.length !== 0 &&
+                data.result.content[0] != undefined &&
+                data.result.content[0].action != undefined;
+              if (!isStudioAction) {
                 outputConsole(data.console);
               }
             }
             if (data.result.status && data.result.status !== "") {
               const status: string = data.result.status;
               outputChannel.appendLine(status);
-              if(status.endsWith("is marked as read only by source control hooks.")) {
+              if (status.endsWith("is marked as read only by source control hooks.")) {
                 vscode.window.showWarningMessage(status, { modal: true });
               }
               throw new Error(data.result.status);
@@ -212,9 +213,9 @@ export class AtelierAPI {
               return data;
             }
           })
-          .catch(error => {
+          .catch((error) => {
             if (error.error && error.error.code === "ECONNREFUSED") {
-              setTimeout(checkConnection, 1000);
+              setTimeout(checkConnection, 30000);
             }
             console.error(error);
             throw error;
@@ -224,7 +225,7 @@ export class AtelierAPI {
   }
 
   public serverInfo(): Promise<any> {
-    return this.request(0, "GET").then(info => {
+    return this.request(0, "GET").then((info) => {
       if (info && info.result && info.result.content && info.result.content.api > 0) {
         const data = info.result.content;
         const apiVersion = data.api;

src/api/index.ts

@@ -32,7 +32,7 @@ async function importFile(file: CurrentFile): Promise<any> {
 }
 
 function updateOthers(others: string[]) {
-  others.forEach(item => {
+  others.forEach((item) => {
     const uri = DocumentContentProvider.getUri(item);
     documentContentProvider.update(uri);
   });
@@ -44,11 +44,11 @@ export async function loadChanges(files: CurrentFile[]): Promise<any> {
   }
   const api = new AtelierAPI(files[0].uri);
   return Promise.all(
-    files.map(file =>
+    files.map((file) =>
       api
         .getDoc(file.name)
-        .then(data => {
-          const content = (data.result.content || []).join("\n");
+        .then((data) => {
+          const content = (data.result.content || []).join(file.eol === vscode.EndOfLine.LF ? "\n" : "\r\n");
           if (file.uri.scheme === "file") {
             fs.writeFileSync(file.fileName, content);
           } else if (file.uri.scheme === FILESYSTEM_SCHEMA) {
@@ -59,7 +59,7 @@ export async function loadChanges(files: CurrentFile[]): Promise<any> {
           }
         })
         .then(() => api.actionIndex([file.name]))
-        .then(data => data.result.content[0].others)
+        .then((data) => data.result.content[0].others)
         .then(updateOthers)
     )
   );
@@ -73,15 +73,15 @@ async function compile(docs: CurrentFile[], flags?: string): Promise<any> {
       {
         cancellable: false,
         location: vscode.ProgressLocation.Notification,
-        title: `Compiling: ${docs.length === 1 ? docs.map(el => el.name).join(", ") : docs.length + " files"}`,
+        title: `Compiling: ${docs.length === 1 ? docs.map((el) => el.name).join(", ") : docs.length + " files"}`,
       },
       () =>
         api
           .actionCompile(
-            docs.map(el => el.name),
+            docs.map((el) => el.name),
             flags
           )
-          .then(data => {
+          .then((data) => {
             const info = docs.length > 1 ? "" : `${docs[0].name}: `;
             if (data.status && data.status.errors && data.status.errors.length) {
               throw new Error(`${info}Compile error`);
@@ -94,7 +94,7 @@ async function compile(docs: CurrentFile[], flags?: string): Promise<any> {
             outputChannel.appendLine(error.message);
             outputChannel.show(true);
             if (!config("suppressCompileErrorMessages")) {
-              vscode.window.showErrorMessage(error.message, "Show details").then(data => {
+              vscode.window.showErrorMessage(error.message, "Show details").then((data) => {
                 outputChannel.show(true);
               });
             }
@@ -116,7 +116,7 @@ export async function importAndCompile(askFLags = false, document?: vscode.TextD
   const defaultFlags = config().compileFlags;
   const flags = askFLags ? await compileFlags() : defaultFlags;
   return importFile(file)
-    .catch(error => {
+    .catch((error) => {
       // console.error(error);
       throw error;
     })
@@ -158,12 +158,12 @@ export async function namespaceCompile(askFLags = false): Promise<any> {
 
 function importFiles(files) {
   return Promise.all<CurrentFile>(
-    files.map(file =>
+    files.map((file) =>
       vscode.workspace
         .openTextDocument(file)
         .then(currentFile)
-        .then(curFile =>
-          importFile(curFile).then(data => {
+        .then((curFile) =>
+          importFile(curFile).then((data) => {
             outputChannel.appendLine("Imported file: " + curFile.fileName);
             return curFile;
           })
@@ -184,7 +184,7 @@ export async function importFolder(uri: vscode.Uri): Promise<any> {
       matchBase: true,
       nocase: true,
     },
-    (error, files) => importFiles(files.map(name => path.join(folder, name)))
+    (error, files) => importFiles(files.map((name) => path.join(folder, name)))
   );
 }
 

src/commands/compile.ts

@@ -15,10 +15,10 @@ function deleteList(items: string[], workspaceFolder: string): Promise<any> {
 
   const api = new AtelierAPI();
   api.setConnection(workspaceFolder);
-  return Promise.all(items.map(item => api.deleteDoc(item))).then(files => {
-    outputChannel.appendLine(`Deleted items: ${files.filter(el => el.result).length}`);
-    const failed = files.filter(el => !el.result).map(el => `${el.file} - ${el.error}`);
-    if (files.find(el => !el.result)) {
+  return Promise.all(items.map((item) => api.deleteDoc(item))).then((files) => {
+    outputChannel.appendLine(`Deleted items: ${files.filter((el) => el.result).length}`);
+    const failed = files.filter((el) => !el.result).map((el) => `${el.file} - ${el.error}`);
+    if (files.find((el) => !el.result)) {
       outputChannel.appendLine(`Items failed to delete: \n${failed.join("\n")}`);
     }
   });
@@ -28,13 +28,13 @@ export async function deleteItem(node: RootNode | PackageNode | ClassNode | Rout
   const workspaceFolder = node.workspaceFolder;
   const nodesList = node instanceof RootNode ? node.getChildren(node) : Promise.resolve([node]);
   return nodesList
-    .then(nodes =>
+    .then((nodes) =>
       nodes.reduce(
         (list, subNode) => list.concat(subNode instanceof PackageNode ? subNode.getClasses() : [subNode.fullName]),
         []
       )
     )
-    .then(items => {
+    .then((items) => {
       deleteList(items, workspaceFolder);
       explorerProvider.refresh();
     });