diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d13553a..0478f0f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.9.7](https://github.com/lgeiger/ide-python/compare/v1.9.6...v1.9.7) (2021-08-24) + + +### Bug Fixes + +* fix replacing $PIPENV_PATH in the python path ([5789f41](https://github.com/lgeiger/ide-python/commit/5789f417d4f7ce0c37c34945f96f6e2001731143)) + ## [1.9.6](https://github.com/lgeiger/ide-python/compare/v1.9.5...v1.9.6) (2021-08-10) diff --git a/dist/main.js b/dist/main.js index d56399bb..828af373 100644 --- a/dist/main.js +++ b/dist/main.js @@ -99,7 +99,9 @@ class PythonLanguageClient extends AutoLanguageClient { pylsEnvironment.VIRTUAL_ENV = venvPath; } - let pythonBin = atom.config.get("ide-python.python") || "python3"; + let pythonBin = atom.config.get("ide-python.python") || "python3"; // replace $PIPENV_PATH in the path + + pythonBin = replacePipEnvPathVar(pythonBin, venvPath); // check if it exists if (whichSync(pythonBin, { nothrow: true @@ -107,7 +109,7 @@ class PythonLanguageClient extends AutoLanguageClient { pythonBin = "python"; } - this.python = replacePipEnvPathVar(pythonBin, venvPath); + this.python = pythonBin; const childProcess = super.spawn(this.python, ["-m", this.getPyLs()], { cwd: projectPath, env: pylsEnvironment @@ -168,4 +170,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":["shell","require","whichSync","sync","AutoLanguageClient","detectVirtualEnv","detectPipEnv","replacePipEnvPathVar","sanitizeConfig","PYTHON_REGEX","PythonLanguageClient","activate","atom","packages","isPackageLoaded","install","then","enablePackage","notifications","addSuccess","config","unset","getGrammarScopes","getLanguageName","getServerName","getRootConfigurationKey","getPyLs","pyls","undefined","get","nothrow","mapConfigurationObject","configuration","lsp","configurationSources","pylsConfigurationSources","rope","plugins","pylsPlugins","startServerProcess","projectPath","venvPath","pylsEnvironment","Object","assign","process","env","VIRTUAL_ENV","pythonBin","python","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","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 = /(([^\\W\\d]|[\\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-python: atom-ide-base was installed and enabled...\")\n        })\n    }\n    // Remove deprecated option\n    atom.config.unset(\"ide-python.pylsPath\")\n    debuggerActivate()\n  }\n\n  /* eslint-disable class-methods-use-this */\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  getPyLs() {\n    if (this.pyls === undefined) {\n      let pyls = atom.config.get(\"ide-python.pyls\") || \"pylsp\"\n      // check if it exists\n      if (whichSync(pyls, { nothrow: true }) === null) {\n        // use the other one if it doesn't exist\n        pyls = pyls === \"pylsp\" ? \"pyls\" : \"pylsp\"\n      }\n      // cache\n      this.pyls = pyls\n    }\n    return this.pyls\n  }\n\n  mapConfigurationObject(configuration) {\n    const lsp = this.getPyLs()\n    return {\n      [lsp]: {\n        configurationSources: configuration.pylsConfigurationSources,\n        rope: sanitizeConfig(configuration.rope),\n        plugins: configuration.pylsPlugins,\n      },\n    }\n  }\n  /* eslint-enable class-methods-use-this */\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\n    let pythonBin = atom.config.get(\"ide-python.python\") || \"python3\"\n    if (whichSync(pythonBin, { nothrow: true }) === null) {\n      pythonBin = \"python\"\n    }\n\n    this.python = replacePipEnvPathVar(pythonBin, venvPath)\n\n    const childProcess = super.spawn(this.python, [\"-m\", this.getPyLs()], {\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 \\`${this.python}\\`.`\n        : `Could not spawn the Python interpreter \\`${this.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          `${this.python} -m pip install 'python-lsp-server[all]'\\n` +\n          `${this.python} -m pip install git+https://github.com/tomv564/pyls-mypy.git\\n` +\n          \"```\",\n      })\n    }\n  }\n\n  getSuggestions(request) {\n    if (!PYTHON_REGEX.test(request.prefix)) {\n      return null\n    }\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) => {\n      const 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","config","unset","getGrammarScopes","getLanguageName","getServerName","getRootConfigurationKey","getPyLs","pyls","undefined","get","nothrow","mapConfigurationObject","configuration","lsp","configurationSources","pylsConfigurationSources","rope","plugins","pylsPlugins","startServerProcess","projectPath","venvPath","pylsEnvironment","Object","assign","process","env","VIRTUAL_ENV","pythonBin","python","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","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 = /(([^\\W\\d]|[\\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-python: atom-ide-base was installed and enabled...\")\n        })\n    }\n    // Remove deprecated option\n    atom.config.unset(\"ide-python.pylsPath\")\n    debuggerActivate()\n  }\n\n  /* eslint-disable class-methods-use-this */\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  getPyLs() {\n    if (this.pyls === undefined) {\n      let pyls = atom.config.get(\"ide-python.pyls\") || \"pylsp\"\n      // check if it exists\n      if (whichSync(pyls, { nothrow: true }) === null) {\n        // use the other one if it doesn't exist\n        pyls = pyls === \"pylsp\" ? \"pyls\" : \"pylsp\"\n      }\n      // cache\n      this.pyls = pyls\n    }\n    return this.pyls\n  }\n\n  mapConfigurationObject(configuration) {\n    const lsp = this.getPyLs()\n    return {\n      [lsp]: {\n        configurationSources: configuration.pylsConfigurationSources,\n        rope: sanitizeConfig(configuration.rope),\n        plugins: configuration.pylsPlugins,\n      },\n    }\n  }\n  /* eslint-enable class-methods-use-this */\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\n    let pythonBin = atom.config.get(\"ide-python.python\") || \"python3\"\n\n    // replace $PIPENV_PATH in the path\n    pythonBin = replacePipEnvPathVar(pythonBin, venvPath)\n\n    // check if it exists\n    if (whichSync(pythonBin, { nothrow: true }) === null) {\n      pythonBin = \"python\"\n    }\n    this.python = pythonBin\n\n    const childProcess = super.spawn(this.python, [\"-m\", this.getPyLs()], {\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 \\`${this.python}\\`.`\n        : `Could not spawn the Python interpreter \\`${this.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          `${this.python} -m pip install 'python-lsp-server[all]'\\n` +\n          `${this.python} -m pip install git+https://github.com/tomv564/pyls-mypy.git\\n` +\n          \"```\",\n      })\n    }\n  }\n\n  getSuggestions(request) {\n    if (!PYTHON_REGEX.test(request.prefix)) {\n      return null\n    }\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) => {\n      const 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 31639f57..01850c73 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ide-python", "main": "./dist/main", - "version": "1.9.6", + "version": "1.9.7", "description": "Python language support for Atom-IDE", "keywords": [ "ide",