diff --git a/CHANGELOG.md b/CHANGELOG.md index ade0a4c9..6956b2aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +# [1.9.0](https://github.com/lgeiger/ide-python/compare/v1.8.0...v1.9.0) (2021-06-09) + + +### Bug Fixes + +* update react ([62049b9](https://github.com/lgeiger/ide-python/commit/62049b9999c462894e3bdd301555b5c7468e9ab7)) +* use which to detect pylsp ([a2c8444](https://github.com/lgeiger/ide-python/commit/a2c844429a717add01d07369a4e0ef0e3255334e)) + + +### Features + +* default to python-lsp-server (pylsp) instead of pyls ([01dfc6c](https://github.com/lgeiger/ide-python/commit/01dfc6cafc0d22a146e7b1cd960cf13ce7e74bae)) +* install atom-ide-base by default ([7bd1e14](https://github.com/lgeiger/ide-python/commit/7bd1e14a706fc8197b952268fc858dc77e468e42)) +* make the path to pyls executable configurable ([ad4d166](https://github.com/lgeiger/ide-python/commit/ad4d16630b126e73347995ea8dd3f136ddd06e38)) +* update atom-languageclient ([cb1db60](https://github.com/lgeiger/ide-python/commit/cb1db60b26fb5edb0c560ed9248ce3b648751fec)) +* update atom-languageclient + use pylsp ([#334](https://github.com/lgeiger/ide-python/issues/334)) ([b56f580](https://github.com/lgeiger/ide-python/commit/b56f580b0f340720fdfe6592e3b9da113bb7fa54)) +* use spawn capabilities of language client ([1cd5126](https://github.com/lgeiger/ide-python/commit/1cd512688fcf457ccd0f5982781b4ffef89540f8)) + # [1.8.0](https://github.com/lgeiger/ide-python/compare/v1.7.4...v1.8.0) (2021-03-23) diff --git a/dist/debugger/main.js b/dist/debugger/main.js index 1f051510..765b5ea5 100644 --- a/dist/debugger/main.js +++ b/dist/debugger/main.js @@ -19,9 +19,9 @@ var _utils = require("./utils"); var _path = _interopRequireDefault(require("path")); -function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; } +function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); } -function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; } +function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } diff --git a/dist/debugger/utils.js b/dist/debugger/utils.js index a9f4f380..c566e428 100644 --- a/dist/debugger/utils.js +++ b/dist/debugger/utils.js @@ -27,9 +27,9 @@ var _nullthrows = _interopRequireDefault(require("nullthrows")); var _log4js = require("log4js"); -function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; } +function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); } -function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; } +function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } diff --git a/dist/main.js b/dist/main.js index 192f6225..f26cb867 100644 --- a/dist/main.js +++ b/dist/main.js @@ -2,12 +2,12 @@ var _main = require("./debugger/main"); -const cp = require("child_process"); - const { shell } = require("electron"); +const whichSync = require("which").sync; + const { AutoLanguageClient } = require("atom-languageclient"); @@ -24,6 +24,20 @@ const { const PYTHON_REGEX = /(([^\d\W]|[\u00A0-\uFFFF])[\w.\u00A0-\uFFFF]*)|\.$/; class PythonLanguageClient extends AutoLanguageClient { + activate() { + super.activate(); + + if (!atom.packages.isPackageLoaded("atom-ide-base")) { + // install if not installed + // eslint-disable-next-line @typescript-eslint/no-var-requires + require("atom-package-deps").install("ide-python", true).then(() => { + // enable if disabled + atom.packages.enablePackage("atom-ide-base"); + atom.notifications.addSuccess("ide-pyhon: atom-ide-base was installed and enabled..."); + }); + } + } + getGrammarScopes() { return ["source.python", "python"]; } @@ -66,33 +80,43 @@ class PythonLanguageClient extends AutoLanguageClient { } const python = replacePipEnvPathVar(atom.config.get("ide-python.python"), venvPath); - const childProcess = cp.spawn(python, ["-m", "pyls"], { + 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(python, ["-m", pyls], { cwd: projectPath, env: pylsEnvironment }); - childProcess.on("error", err => { - const description = err.code == "ENOENT" ? `No Python interpreter found at \`${python}\`.` : `Could not spawn the Python interpreter \`${python}\`.`; - atom.notifications.addError("`ide-python` could not launch your Python runtime.", { + return childProcess; + } + + onSpawnError(err) { + const description = err.code == "ENOENT" ? `No Python interpreter found at \`${python}\`.` : `Could not spawn the Python interpreter \`${python}\`.`; + atom.notifications.addError("`ide-python` could not launch your Python runtime.", { + dismissable: true, + description: `${description}

If you have Python installed please set "Python Executable" setting correctly. If you do not please install Python.

` + }); + } + + onSpawnClose(code, signal) { + if (code !== 0 && signal == null) { + atom.notifications.addError("Unable to start the Python language server.", { dismissable: true, - description: `${description}

If you have Python installed please set "Python Executable" setting correctly. If you do not please install Python.

` + buttons: [{ + text: "Install Instructions", + onDidClick: () => atom.workspace.open("atom://config/packages/ide-python") + }, { + text: "Download Python", + onDidClick: () => shell.openExternal("https://www.python.org/downloads/") + }], + description: "Make sure to install `pylsp` 0.19 or newer by running:\n" + "```\n" + `${python} -m pip install 'python-lsp-server[all]'\n` + `${python} -m pip install git+https://github.com/tomv564/pyls-mypy.git\n` + "```" }); - }); - childProcess.on("close", (code, signal) => { - if (code !== 0 && signal == null) { - atom.notifications.addError("Unable to start the Python language server.", { - dismissable: true, - buttons: [{ - text: "Install Instructions", - onDidClick: () => atom.workspace.open("atom://config/packages/ide-python") - }, { - text: "Download Python", - onDidClick: () => shell.openExternal("https://www.python.org/downloads/") - }], - description: "Make sure to install `pyls` 0.19 or newer by running:\n" + "```\n" + `${python} -m pip install 'python-language-server[all]'\n` + `${python} -m pip install git+https://github.com/tomv564/pyls-mypy.git\n` + "```" - }); - } - }); - return childProcess; + } } async getSuggestions(request) { @@ -121,4 +145,4 @@ const pythonClient = new PythonLanguageClient(); pythonClient.createDebuggerProvider = _main.createDebuggerProvider; // add the debugger module.exports = pythonClient; -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["main.js"],"names":["cp","require","shell","AutoLanguageClient","detectVirtualEnv","detectPipEnv","replacePipEnvPathVar","sanitizeConfig","PYTHON_REGEX","PythonLanguageClient","getGrammarScopes","getLanguageName","getServerName","getRootConfigurationKey","activate","atom","config","unset","mapConfigurationObject","configuration","pyls","configurationSources","pylsConfigurationSources","rope","plugins","pylsPlugins","startServerProcess","projectPath","venvPath","pylsEnvironment","Object","assign","process","env","python","get","childProcess","spawn","cwd","on","err","description","code","notifications","addError","dismissable","signal","buttons","text","onDidClick","workspace","open","openExternal","getSuggestions","request","test","prefix","deactivate","Promise","race","createTimeoutPromise","milliseconds","resolve","reject","timeout","setTimeout","clearTimeout","logger","error","pythonClient","createDebuggerProvider","module","exports"],"mappings":"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","sourcesContent":["const cp = require(\"child_process\")\nconst { shell } = require(\"electron\")\nconst { AutoLanguageClient } = require(\"atom-languageclient\")\nconst { detectVirtualEnv, detectPipEnv, replacePipEnvPathVar, sanitizeConfig } = require(\"./utils\")\n\nimport { createDebuggerProvider, activate as debuggerActivate, dispose as debuggerDispose } from \"./debugger/main\"\n\n// Ref: https://github.com/nteract/hydrogen/blob/master/lib/autocomplete-provider.js#L33\n// adapted from http://stackoverflow.com/q/5474008\nconst PYTHON_REGEX = /(([^\\d\\W]|[\\u00A0-\\uFFFF])[\\w.\\u00A0-\\uFFFF]*)|\\.$/\n\nclass PythonLanguageClient extends AutoLanguageClient {\n  getGrammarScopes() {\n    return [\"source.python\", \"python\"]\n  }\n\n  getLanguageName() {\n    return \"Python\"\n  }\n\n  getServerName() {\n    return \"pyls\"\n  }\n\n  getRootConfigurationKey() {\n    return \"ide-python\"\n  }\n\n  activate() {\n    // Remove deprecated option\n    atom.config.unset(\"ide-python.pylsPath\")\n    super.activate()\n    debuggerActivate()\n  }\n\n  mapConfigurationObject(configuration) {\n    return {\n      pyls: {\n        configurationSources: configuration.pylsConfigurationSources,\n        rope: sanitizeConfig(configuration.rope),\n        plugins: configuration.pylsPlugins,\n      },\n    }\n  }\n\n  async startServerProcess(projectPath) {\n    const venvPath = (await detectPipEnv(projectPath)) || (await detectVirtualEnv(projectPath))\n    const pylsEnvironment = Object.assign({}, process.env)\n    if (venvPath) {\n      pylsEnvironment[\"VIRTUAL_ENV\"] = venvPath\n    }\n    const python = replacePipEnvPathVar(atom.config.get(\"ide-python.python\"), venvPath)\n    const childProcess = cp.spawn(python, [\"-m\", \"pyls\"], {\n      cwd: projectPath,\n      env: pylsEnvironment,\n    })\n    childProcess.on(\"error\", (err) => {\n      const description =\n        err.code == \"ENOENT\"\n          ? `No Python interpreter found at \\`${python}\\`.`\n          : `Could not spawn the Python interpreter \\`${python}\\`.`\n      atom.notifications.addError(\"`ide-python` could not launch your Python runtime.\", {\n        dismissable: true,\n        description: `${description}<p>If you have Python installed please set \"Python Executable\" setting correctly. If you do not please install Python.</p>`,\n      })\n    })\n\n    childProcess.on(\"close\", (code, signal) => {\n      if (code !== 0 && signal == null) {\n        atom.notifications.addError(\"Unable to start the Python language server.\", {\n          dismissable: true,\n          buttons: [\n            {\n              text: \"Install Instructions\",\n              onDidClick: () => atom.workspace.open(\"atom://config/packages/ide-python\"),\n            },\n            {\n              text: \"Download Python\",\n              onDidClick: () => shell.openExternal(\"https://www.python.org/downloads/\"),\n            },\n          ],\n          description:\n            \"Make sure to install `pyls` 0.19 or newer by running:\\n\" +\n            \"```\\n\" +\n            `${python} -m pip install 'python-language-server[all]'\\n` +\n            `${python} -m pip install git+https://github.com/tomv564/pyls-mypy.git\\n` +\n            \"```\",\n        })\n      }\n    })\n    return childProcess\n  }\n\n  async getSuggestions(request) {\n    if (!PYTHON_REGEX.test(request.prefix)) return null\n    return super.getSuggestions(request)\n  }\n\n  deactivate() {\n    debuggerDispose()\n    return Promise.race([super.deactivate(), this.createTimeoutPromise(2000)])\n  }\n\n  createTimeoutPromise(milliseconds) {\n    return new Promise((resolve, reject) => {\n      let timeout = setTimeout(() => {\n        clearTimeout(timeout)\n        this.logger.error(`Server failed to shutdown in ${milliseconds}ms, forcing termination`)\n        resolve()\n      }, milliseconds)\n    })\n  }\n}\n\nconst pythonClient = new PythonLanguageClient()\npythonClient.createDebuggerProvider = createDebuggerProvider // add the debugger\nmodule.exports = pythonClient\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["main.js"],"names":["shell","require","whichSync","sync","AutoLanguageClient","detectVirtualEnv","detectPipEnv","replacePipEnvPathVar","sanitizeConfig","PYTHON_REGEX","PythonLanguageClient","activate","atom","packages","isPackageLoaded","install","then","enablePackage","notifications","addSuccess","getGrammarScopes","getLanguageName","getServerName","getRootConfigurationKey","config","unset","mapConfigurationObject","configuration","pyls","configurationSources","pylsConfigurationSources","rope","plugins","pylsPlugins","startServerProcess","projectPath","venvPath","pylsEnvironment","Object","assign","process","env","python","get","nothrow","childProcess","spawn","cwd","onSpawnError","err","description","code","addError","dismissable","onSpawnClose","signal","buttons","text","onDidClick","workspace","open","openExternal","getSuggestions","request","test","prefix","deactivate","Promise","race","createTimeoutPromise","milliseconds","resolve","reject","timeout","setTimeout","clearTimeout","logger","error","pythonClient","createDebuggerProvider","module","exports"],"mappings":"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","sourcesContent":["const { shell } = require(\"electron\")\nconst whichSync = require(\"which\").sync\nconst { AutoLanguageClient } = require(\"atom-languageclient\")\nconst { detectVirtualEnv, detectPipEnv, replacePipEnvPathVar, sanitizeConfig } = require(\"./utils\")\n\nimport { createDebuggerProvider, activate as debuggerActivate, dispose as debuggerDispose } from \"./debugger/main\"\n\n// Ref: https://github.com/nteract/hydrogen/blob/master/lib/autocomplete-provider.js#L33\n// adapted from http://stackoverflow.com/q/5474008\nconst PYTHON_REGEX = /(([^\\d\\W]|[\\u00A0-\\uFFFF])[\\w.\\u00A0-\\uFFFF]*)|\\.$/\n\nclass PythonLanguageClient extends AutoLanguageClient {\n  activate() {\n    super.activate()\n    if (!atom.packages.isPackageLoaded(\"atom-ide-base\")) {\n      // install if not installed\n      // eslint-disable-next-line @typescript-eslint/no-var-requires\n      require(\"atom-package-deps\")\n        .install(\"ide-python\", true)\n        .then(() => {\n          // enable if disabled\n          atom.packages.enablePackage(\"atom-ide-base\")\n          atom.notifications.addSuccess(\"ide-pyhon: atom-ide-base was installed and enabled...\")\n        })\n    }\n  }\n\n  getGrammarScopes() {\n    return [\"source.python\", \"python\"]\n  }\n\n  getLanguageName() {\n    return \"Python\"\n  }\n\n  getServerName() {\n    return \"pyls\"\n  }\n\n  getRootConfigurationKey() {\n    return \"ide-python\"\n  }\n\n  activate() {\n    // Remove deprecated option\n    atom.config.unset(\"ide-python.pylsPath\")\n    super.activate()\n    debuggerActivate()\n  }\n\n  mapConfigurationObject(configuration) {\n    return {\n      pyls: {\n        configurationSources: configuration.pylsConfigurationSources,\n        rope: sanitizeConfig(configuration.rope),\n        plugins: configuration.pylsPlugins,\n      },\n    }\n  }\n\n  async startServerProcess(projectPath) {\n    const venvPath = (await detectPipEnv(projectPath)) || (await detectVirtualEnv(projectPath))\n    const pylsEnvironment = Object.assign({}, process.env)\n    if (venvPath) {\n      pylsEnvironment[\"VIRTUAL_ENV\"] = venvPath\n    }\n    const python = replacePipEnvPathVar(atom.config.get(\"ide-python.python\"), venvPath)\n\n    let pyls = atom.config.get(\"ide-python.pyls\") || \"pylsp\"\n    // check if it exists\n    if (whichSync(pyls, { nothrow: true }) === null) {\n      pyls = \"pyls\"\n    }\n    const childProcess = super.spawn(python, [\"-m\", pyls], {\n      cwd: projectPath,\n      env: pylsEnvironment,\n    })\n    return childProcess\n  }\n\n  onSpawnError(err) {\n    const description =\n      err.code == \"ENOENT\"\n        ? `No Python interpreter found at \\`${python}\\`.`\n        : `Could not spawn the Python interpreter \\`${python}\\`.`\n    atom.notifications.addError(\"`ide-python` could not launch your Python runtime.\", {\n      dismissable: true,\n      description: `${description}<p>If you have Python installed please set \"Python Executable\" setting correctly. If you do not please install Python.</p>`,\n    })\n  }\n\n  onSpawnClose(code, signal) {\n    if (code !== 0 && signal == null) {\n      atom.notifications.addError(\"Unable to start the Python language server.\", {\n        dismissable: true,\n        buttons: [\n          {\n            text: \"Install Instructions\",\n            onDidClick: () => atom.workspace.open(\"atom://config/packages/ide-python\"),\n          },\n          {\n            text: \"Download Python\",\n            onDidClick: () => shell.openExternal(\"https://www.python.org/downloads/\"),\n          },\n        ],\n        description:\n          \"Make sure to install `pylsp` 0.19 or newer by running:\\n\" +\n          \"```\\n\" +\n          `${python} -m pip install 'python-lsp-server[all]'\\n` +\n          `${python} -m pip install git+https://github.com/tomv564/pyls-mypy.git\\n` +\n          \"```\",\n      })\n    }\n  }\n\n  async getSuggestions(request) {\n    if (!PYTHON_REGEX.test(request.prefix)) return null\n    return super.getSuggestions(request)\n  }\n\n  deactivate() {\n    debuggerDispose()\n    return Promise.race([super.deactivate(), this.createTimeoutPromise(2000)])\n  }\n\n  createTimeoutPromise(milliseconds) {\n    return new Promise((resolve, reject) => {\n      let timeout = setTimeout(() => {\n        clearTimeout(timeout)\n        this.logger.error(`Server failed to shutdown in ${milliseconds}ms, forcing termination`)\n        resolve()\n      }, milliseconds)\n    })\n  }\n}\n\nconst pythonClient = new PythonLanguageClient()\npythonClient.createDebuggerProvider = createDebuggerProvider // add the debugger\nmodule.exports = pythonClient\n"]} \ No newline at end of file diff --git a/package.json b/package.json index 7e03e7bb..c7ad14e6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ide-python", "main": "./dist/main", - "version": "1.8.0", + "version": "1.9.0", "description": "Python language support for Atom-IDE", "keywords": [ "ide",