Merge pull request #360 from atom-community/python3

Author: aminya

.eslintrc.json

@@ -0,0 +1,4 @@
+{
+  "extends": "eslint-config-atomic",
+  "ignorePatterns": ["dist/", "node_modules/", "lib/debugger/VendorLib"]
+}

.github/workflows/CI.yml

@@ -47,8 +47,8 @@ jobs:
       - name: Format ✨
         run: npm run test.format
 
-      # - name: Lint ✨
-      #   run: npm run test.lint
+      - name: Lint ✨
+        run: npm run test.lint
 
   Release:
     needs: [Test]

babel.config.js

@@ -1,10 +1,10 @@
-let presets = ["babel-preset-atomic"]
+const presets = ["babel-preset-atomic"]
 
-let plugins = []
+const plugins = []
 
 module.exports = {
-  presets: presets,
-  plugins: plugins,
+  presets,
+  plugins,
   exclude: ["node_modules/**", "lib/debugger/VendorLib/**"],
   sourceMap: "inline",
 }

lib/debugger/RemoteDebuggerCommandService.js

@@ -56,7 +56,7 @@ export function observeAttachDebugTargets(): ConnectableObservable<Array<PythonD
 }
 
 function isPortUsed(port: number): Promise<boolean> {
-  const tryConnectPromise = new Promise((resolve, reject) => {
+  const tryConnectPromise = new Promise((resolve) => {
     const client = new net.Socket()
     client
       .once("connect", () => {
@@ -134,7 +134,7 @@ function handleJsonRequest(body, res) {
     const port = Number(body.port)
     getLogger().info("Remote debug target attach request", body)
     const target = attachReady.get(port)
-    if (target != null) {
+    if (target !== undefined) {
       debugRequests.next({
         type,
         command,

lib/debugger/utils.js

@@ -10,9 +10,7 @@ import { fastDebounce } from "@atom-ide-community/nuclide-commons/observable"
 import UniversalDisposable from "@atom-ide-community/nuclide-commons/UniversalDisposable"
 import { Observable } from "rxjs-compat/bundles/rxjs-compat.umd.min.js"
 import { track } from "@atom-ide-community/nuclide-commons/analytics"
-import * as RemoteDebuggerCommandServiceLocal from "./RemoteDebuggerCommandService"
 import nullthrows from "nullthrows"
-import { getLogger } from "log4js"
 
 let _rpcService: ?nuclide$RpcService = null
 
@@ -52,6 +50,7 @@ export function listenToRemoteDebugCommands(): IDisposable {
     const rootUri = hostname === "local" ? "" : nuclideUri.createRemoteUri(hostname, "/")
     const service = getRemoteDebuggerCommandServiceByNuclideUri(rootUri)
     if (service == null) {
+      const { getLogger } = require("log4js")
       getLogger().error("null remote command service for uri:", rootUri)
       return Observable.empty()
     } else {
@@ -146,6 +145,7 @@ function findDuplicateAttachTargetIds(targets: Array<PythonDebuggerAttachTarget>
 }
 
 export function getRemoteDebuggerCommandServiceByNuclideUri(uri: NuclideUri): RemoteDebuggerCommandService {
+  const RemoteDebuggerCommandServiceLocal = require("./RemoteDebuggerCommandService")
   if (_rpcService == null && !nuclideUri.isRemote(uri)) {
     return RemoteDebuggerCommandServiceLocal
   }

lib/main.js

@@ -7,7 +7,7 @@ import { createDebuggerProvider, activate as debuggerActivate, dispose as debugg
 
 // Ref: https://github.com/nteract/hydrogen/blob/master/lib/autocomplete-provider.js#L33
 // adapted from http://stackoverflow.com/q/5474008
-const PYTHON_REGEX = /(([^\d\W]|[\u00A0-\uFFFF])[\w.\u00A0-\uFFFF]*)|\.$/
+const PYTHON_REGEX = /(([^\W\d]|[\u00A0-\uFFFF])[\w.\u00A0-\uFFFF]*)|\.$/
 
 class PythonLanguageClient extends AutoLanguageClient {
   activate() {
@@ -23,8 +23,12 @@ class PythonLanguageClient extends AutoLanguageClient {
           atom.notifications.addSuccess("ide-pyhon: atom-ide-base was installed and enabled...")
         })
     }
+    // Remove deprecated option
+    atom.config.unset("ide-python.pylsPath")
+    debuggerActivate()
   }
 
+  /* eslint-disable class-methods-use-this */
   getGrammarScopes() {
     return ["source.python", "python"]
   }
@@ -41,13 +45,6 @@ class PythonLanguageClient extends AutoLanguageClient {
     return "ide-python"
   }
 
-  activate() {
-    // Remove deprecated option
-    atom.config.unset("ide-python.pylsPath")
-    super.activate()
-    debuggerActivate()
-  }
-
   mapConfigurationObject(configuration) {
     return {
       pyls: {
@@ -57,20 +54,28 @@ class PythonLanguageClient extends AutoLanguageClient {
       },
     }
   }
+  /* eslint-enable class-methods-use-this */
 
   async startServerProcess(projectPath) {
     const venvPath = (await detectPipEnv(projectPath)) || (await detectVirtualEnv(projectPath))
     const pylsEnvironment = Object.assign({}, process.env)
     if (venvPath) {
-      pylsEnvironment["VIRTUAL_ENV"] = venvPath
+      pylsEnvironment.VIRTUAL_ENV = venvPath
+    }
+
+    let pythonBin = atom.config.get("ide-python.python") || "python3"
+    if (whichSync(pythonBin, { nothrow: true }) === null) {
+      pythonBin = "python"
     }
-    this.python = replacePipEnvPathVar(atom.config.get("ide-python.python"), venvPath)
+
+    this.python = replacePipEnvPathVar(pythonBin, venvPath)
 
     let pyls = atom.config.get("ide-python.pyls") || "pylsp"
     // check if it exists
     if (whichSync(pyls, { nothrow: true }) === null) {
       pyls = "pyls"
     }
+
     const childProcess = super.spawn(this.python, ["-m", pyls], {
       cwd: projectPath,
       env: pylsEnvironment,
@@ -80,7 +85,7 @@ class PythonLanguageClient extends AutoLanguageClient {
 
   onSpawnError(err) {
     const description =
-      err.code == "ENOENT"
+      err.code === "ENOENT"
         ? `No Python interpreter found at \`${this.python}\`.`
         : `Could not spawn the Python interpreter \`${this.python}\`.`
     atom.notifications.addError("`ide-python` could not launch your Python runtime.", {
@@ -90,7 +95,7 @@ class PythonLanguageClient extends AutoLanguageClient {
   }
 
   onSpawnClose(code, signal) {
-    if (code !== 0 && signal == null) {
+    if (code !== 0 && signal === null) {
       atom.notifications.addError("Unable to start the Python language server.", {
         dismissable: true,
         buttons: [
@@ -113,8 +118,10 @@ class PythonLanguageClient extends AutoLanguageClient {
     }
   }
 
-  async getSuggestions(request) {
-    if (!PYTHON_REGEX.test(request.prefix)) return null
+  getSuggestions(request) {
+    if (!PYTHON_REGEX.test(request.prefix)) {
+      return null
+    }
     return super.getSuggestions(request)
   }
 
@@ -124,8 +131,8 @@ class PythonLanguageClient extends AutoLanguageClient {
   }
 
   createTimeoutPromise(milliseconds) {
-    return new Promise((resolve, reject) => {
-      let timeout = setTimeout(() => {
+    return new Promise((resolve) => {
+      const timeout = setTimeout(() => {
         clearTimeout(timeout)
         this.logger.error(`Server failed to shutdown in ${milliseconds}ms, forcing termination`)
         resolve()

lib/utils.js

@@ -22,27 +22,29 @@ function detectPipEnv(path) {
 }
 
 async function detectVirtualEnv(path) {
-  const entries = await new Promise((resolve) =>
-    new Directory(path).getEntries((error, entries) => {
+  const entries = await new Promise((resolve) => {
+    new Directory(path).getEntries((error, resolvedEntries) => {
       if (error === null) {
-        resolve(entries)
+        resolve(resolvedEntries)
       } else {
         resolve(null)
       }
     })
-  )
+  })
   if (entries) {
-    for (let entry of entries) {
+    for (const entry of entries) {
       if (entry.isDirectory()) {
         if (VIRTUAL_ENV_BIN_DIRS.indexOf(entry.getBaseName()) !== -1) {
-          for (let executable of VIRTUAL_ENV_EXECUTABLES) {
+          for (const executable of VIRTUAL_ENV_EXECUTABLES) {
+            /* eslint-disable-next-line no-await-in-loop */
             if (await entry.getFile(executable).exists()) {
               return path
             }
           }
         } else {
-          for (let dir_name of VIRTUAL_ENV_BIN_DIRS) {
-            for (let executable of VIRTUAL_ENV_EXECUTABLES) {
+          for (const dir_name of VIRTUAL_ENV_BIN_DIRS) {
+            for (const executable of VIRTUAL_ENV_EXECUTABLES) {
+              /* eslint-disable-next-line no-await-in-loop */
               if (await entry.getSubdirectory(dir_name).getFile(executable).exists()) {
                 return entry.getPath()
               }

package.json

@@ -37,8 +37,7 @@
     "babel": "npm run clean && shx cp -r lib dist && cross-env NODE_ENV=production cross-env BABEL_KEEP_MODULES=false babel dist --out-dir dist",
     "copy": "shx cp -r lib/debugger/VendorLib dist/debugger",
     "build": "npm run babel",
-    "build-commit": "build-commit -o dist",
-    "prepare": "npm run build"
+    "build-commit": "build-commit -o dist"
   },
   "package-deps": [
     "atom-ide-base"
@@ -48,7 +47,7 @@
     "@atom-ide-community/nuclide-commons-atom": "^0.8.2",
     "@atom-ide-community/nuclide-debugger-common": "^0.8.2",
     "arch": "2.1.0",
-    "atom-languageclient": "^1.12.1",
+    "atom-languageclient": "^1.14.1",
     "atom-package-deps": "^7.2.3",
     "dotenv": "5.0.1",
     "fs-extra": "4.0.3",
@@ -77,9 +76,10 @@
   "devDependencies": {
     "@babel/cli": "7.14.3",
     "@babel/core": "7.14.3",
-    "babel-preset-atomic": "^4.1.0",
+    "babel-preset-atomic": "^4.2.0",
     "build-commit": "0.1.4",
     "cross-env": "^7.0.3",
+    "eslint-config-atomic": "^1.16.2",
     "mock-spawn": "0.2.6",
     "prettier-config-atomic": "^2.0.5",
     "shx": "^0.3.3"
@@ -96,7 +96,7 @@
       "title": "Python Executable",
       "order": 1,
       "type": "string",
-      "default": "python",
+      "default": "python3",
       "description": "Absolute path of your Python binary. This is used to launch the Python language server. Make sure to install `pyls` for this version of Python. Changes will take effect after a restart of the language server. Use `$PIPENV_PATH/bin/python` if you want to use the pipenv path of your project"
     },
     "pyls": {