From 7d6e415d4fcfdc5ce16c9ad305c305033b73f970 Mon Sep 17 00:00:00 2001 From: Till Hainbach Date: Thu, 3 Dec 2020 14:21:32 +0100 Subject: [PATCH 1/8] Add settings for pyls-mypy --- package.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/package.json b/package.json index d79a1484..02bcd196 100644 --- a/package.json +++ b/package.json @@ -438,6 +438,26 @@ } } }, + "pyls_mypy": { + "title": "MyPy", + "type": "object", + "properties": { + "enabled": { + "title": "Enabled", + "type": "boolean", + "order": 1, + "default": true, + "description": "Enable or disable MyPy." + }, + "live_mode": { + "title": "Live mode", + "type": "boolean", + "order": 1, + "default": false, + "description": "Turn on live mode (If disabled, mypy linters on file save)." + } + } + }, "flake8": { "title": "Flake8", "type": "object", From 76183b37a403bee068678bb0e36dc6251c90b141 Mon Sep 17 00:00:00 2001 From: Till Hainbach Date: Thu, 3 Dec 2020 14:25:10 +0100 Subject: [PATCH 2/8] Update error description to include install pyls-mypy --- dist/main.js | 4 ++-- lib/main.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dist/main.js b/dist/main.js index bbd32658..a6c0e0dc 100644 --- a/dist/main.js +++ b/dist/main.js @@ -88,7 +88,7 @@ class PythonLanguageClient extends AutoLanguageClient { 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` + "```" + 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+git+https://github.com/tomv564/pyls-mypy.git\n` +"```" }); } }); @@ -121,4 +121,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 {\n  detectVirtualEnv,\n  detectPipEnv,\n  replacePipEnvPathVar,\n  sanitizeConfig\n} = 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 =\n      (await detectPipEnv(projectPath)) ||\n      (await detectVirtualEnv(projectPath));\n    const pylsEnvironment = Object.assign({}, process.env);\n    if (venvPath) {\n      pylsEnvironment[\"VIRTUAL_ENV\"] = venvPath;\n    }\n    const python = replacePipEnvPathVar(\n      atom.config.get(\"ide-python.python\"),\n      venvPath\n    );\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(\n        \"`ide-python` could not launch your Python runtime.\",\n        {\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\n    childProcess.on(\"close\", (code, signal) => {\n      if (code !== 0 && signal == null) {\n        atom.notifications.addError(\n          \"Unable to start the Python language server.\",\n          {\n            dismissable: true,\n            buttons: [\n              {\n                text: \"Install Instructions\",\n                onDidClick: () =>\n                  atom.workspace.open(\"atom://config/packages/ide-python\")\n              },\n              {\n                text: \"Download Python\",\n                onDidClick: () =>\n                  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              \"```\"\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(\n          `Server failed to shutdown in ${milliseconds}ms, forcing termination`\n        );\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":["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 {\n  detectVirtualEnv,\n  detectPipEnv,\n  replacePipEnvPathVar,\n  sanitizeConfig\n} = 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 =\n      (await detectPipEnv(projectPath)) ||\n      (await detectVirtualEnv(projectPath));\n    const pylsEnvironment = Object.assign({}, process.env);\n    if (venvPath) {\n      pylsEnvironment[\"VIRTUAL_ENV\"] = venvPath;\n    }\n    const python = replacePipEnvPathVar(\n      atom.config.get(\"ide-python.python\"),\n      venvPath\n    );\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(\n        \"`ide-python` could not launch your Python runtime.\",\n        {\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\n    childProcess.on(\"close\", (code, signal) => {\n      if (code !== 0 && signal == null) {\n        atom.notifications.addError(\n          \"Unable to start the Python language server.\",\n          {\n            dismissable: true,\n            buttons: [\n              {\n                text: \"Install Instructions\",\n                onDidClick: () =>\n                  atom.workspace.open(\"atom://config/packages/ide-python\")\n              },\n              {\n                text: \"Download Python\",\n                onDidClick: () =>\n                  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              \"```\"\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(\n          `Server failed to shutdown in ${milliseconds}ms, forcing termination`\n        );\n        resolve();\n      }, milliseconds);\n    });\n  }\n}\n\nconst pythonClient = new PythonLanguageClient()\npythonClient.createDebuggerProvider = createDebuggerProvider; // add the debugger\nmodule.exports = pythonClient;\n"]} diff --git a/lib/main.js b/lib/main.js index 59a48d01..0c42b26d 100644 --- a/lib/main.js +++ b/lib/main.js @@ -100,6 +100,7 @@ class PythonLanguageClient extends AutoLanguageClient { "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+git+https://github.com/tomv564/pyls-mypy.git\n` + "```" } ); From 5dad5fbbc5b58448b06de1220085296b96c251ae Mon Sep 17 00:00:00 2001 From: tillhainbach <33448151+tillhainbach@users.noreply.github.com> Date: Tue, 15 Dec 2020 11:36:23 +0100 Subject: [PATCH 3/8] Fix superflous "git+" in error description Obviously, it should have been git+https: ... from the start... --- lib/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main.js b/lib/main.js index 0c42b26d..3df4779a 100644 --- a/lib/main.js +++ b/lib/main.js @@ -100,7 +100,7 @@ class PythonLanguageClient extends AutoLanguageClient { "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+git+https://github.com/tomv564/pyls-mypy.git\n` + + `${python} -m pip install git+https://github.com/tomv564/pyls-mypy.git\n` + "```" } ); From 8fa547bf0f866425554bb88726ef0bdf2e3a358e Mon Sep 17 00:00:00 2001 From: tillhainbach <33448151+tillhainbach@users.noreply.github.com> Date: Tue, 15 Dec 2020 11:37:05 +0100 Subject: [PATCH 4/8] Fix superflous "git+" --- dist/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/main.js b/dist/main.js index a6c0e0dc..3f00b03b 100644 --- a/dist/main.js +++ b/dist/main.js @@ -88,7 +88,7 @@ class PythonLanguageClient extends AutoLanguageClient { 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+git+https://github.com/tomv564/pyls-mypy.git\n` +"```" + 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` +"```" }); } }); From e8fe09fbeba2da2359b57cdd5f664f048df4567e Mon Sep 17 00:00:00 2001 From: tillhainbach <33448151+tillhainbach@users.noreply.github.com> Date: Sun, 14 Mar 2021 11:46:07 +0100 Subject: [PATCH 5/8] feat(add-pyls-mypy): remove conflict markers --- dist/main.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dist/main.js b/dist/main.js index 9e565078..dc86687c 100644 --- a/dist/main.js +++ b/dist/main.js @@ -121,8 +121,4 @@ const pythonClient = new PythonLanguageClient(); pythonClient.createDebuggerProvider = _main.createDebuggerProvider; // add the debugger module.exports = pythonClient; -<<<<<<< HEAD -//# 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 {\n  detectVirtualEnv,\n  detectPipEnv,\n  replacePipEnvPathVar,\n  sanitizeConfig\n} = 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 =\n      (await detectPipEnv(projectPath)) ||\n      (await detectVirtualEnv(projectPath));\n    const pylsEnvironment = Object.assign({}, process.env);\n    if (venvPath) {\n      pylsEnvironment[\"VIRTUAL_ENV\"] = venvPath;\n    }\n    const python = replacePipEnvPathVar(\n      atom.config.get(\"ide-python.python\"),\n      venvPath\n    );\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(\n        \"`ide-python` could not launch your Python runtime.\",\n        {\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\n    childProcess.on(\"close\", (code, signal) => {\n      if (code !== 0 && signal == null) {\n        atom.notifications.addError(\n          \"Unable to start the Python language server.\",\n          {\n            dismissable: true,\n            buttons: [\n              {\n                text: \"Install Instructions\",\n                onDidClick: () =>\n                  atom.workspace.open(\"atom://config/packages/ide-python\")\n              },\n              {\n                text: \"Download Python\",\n                onDidClick: () =>\n                  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              \"```\"\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(\n          `Server failed to shutdown in ${milliseconds}ms, forcing termination`\n        );\n        resolve();\n      }, milliseconds);\n    });\n  }\n}\n\nconst pythonClient = new PythonLanguageClient()\npythonClient.createDebuggerProvider = createDebuggerProvider; // add the debugger\nmodule.exports = pythonClient;\n"]} -======= //# 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            \"```\",\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"]} ->>>>>>> master From aa3c181c1a9a554f63d317c844105a7d0846ce76 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sun, 14 Mar 2021 23:54:41 -0500 Subject: [PATCH 6/8] chore: pnpm format --- dist/main.js | 4 ++-- lib/main.js | 35 ++++++++++++----------------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/dist/main.js b/dist/main.js index dc86687c..00fbfe71 100644 --- a/dist/main.js +++ b/dist/main.js @@ -88,7 +88,7 @@ class PythonLanguageClient extends AutoLanguageClient { 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` +"```" + description: "Make sure to install `pyls` 0.19 or newer by running:\n" + "```\n" + `${python} -m pip install 'python-language-server[all]'\n` + "```" }); } }); @@ -121,4 +121,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            \"```\",\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"]} +//# 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            \"```\",\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 diff --git a/lib/main.js b/lib/main.js index 49adabb0..6cc999fd 100644 --- a/lib/main.js +++ b/lib/main.js @@ -1,22 +1,9 @@ const cp = require("child_process") -const { - shell -} = require("electron") -const { - AutoLanguageClient -} = require("atom-languageclient") -const { - detectVirtualEnv, - detectPipEnv, - replacePipEnvPathVar, - sanitizeConfig -} = require("./utils") +const { shell } = require("electron") +const { AutoLanguageClient } = require("atom-languageclient") +const { detectVirtualEnv, detectPipEnv, replacePipEnvPathVar, sanitizeConfig } = require("./utils") -import { - createDebuggerProvider, - activate as debuggerActivate, - dispose as debuggerDispose -} from "./debugger/main" +import { createDebuggerProvider, activate as debuggerActivate, dispose as debuggerDispose } from "./debugger/main" // Ref: https://github.com/nteract/hydrogen/blob/master/lib/autocomplete-provider.js#L33 // adapted from http://stackoverflow.com/q/5474008 @@ -69,9 +56,9 @@ class PythonLanguageClient extends AutoLanguageClient { }) childProcess.on("error", (err) => { const description = - err.code == "ENOENT" ? - `No Python interpreter found at \`${python}\`.` : - `Could not spawn the Python interpreter \`${python}\`.` + 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.

`, @@ -82,7 +69,8 @@ class PythonLanguageClient extends AutoLanguageClient { if (code !== 0 && signal == null) { atom.notifications.addError("Unable to start the Python language server.", { dismissable: true, - buttons: [{ + buttons: [ + { text: "Install Instructions", onDidClick: () => atom.workspace.open("atom://config/packages/ide-python"), }, @@ -91,7 +79,8 @@ class PythonLanguageClient extends AutoLanguageClient { onDidClick: () => shell.openExternal("https://www.python.org/downloads/"), }, ], - description: "Make sure to install `pyls` 0.19 or newer by running:\n" + + 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` + @@ -125,4 +114,4 @@ class PythonLanguageClient extends AutoLanguageClient { const pythonClient = new PythonLanguageClient() pythonClient.createDebuggerProvider = createDebuggerProvider // add the debugger -module.exports = pythonClient \ No newline at end of file +module.exports = pythonClient From 5b388b2471de0e555cc62c33ee91cbf28eb4d398 Mon Sep 17 00:00:00 2001 From: tillhainbach <33448151+tillhainbach@users.noreply.github.com> Date: Mon, 22 Mar 2021 14:42:14 +0100 Subject: [PATCH 7/8] fix(pyls-mypy): set live-mode default to true Set default live-mode to pyls-mypy defaults. Co-authored-by: Amin Yahyaabadi --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2ff4ac07..deb4aa8a 100644 --- a/package.json +++ b/package.json @@ -458,7 +458,7 @@ "title": "Live mode", "type": "boolean", "order": 1, - "default": false, + "default": true, "description": "Turn on live mode (If disabled, mypy linters on file save)." } } From cd4c12dcac98dd7906bd5e02a5b361c1b5f8723a Mon Sep 17 00:00:00 2001 From: Till Hainbach Date: Tue, 23 Mar 2021 11:51:46 +0100 Subject: [PATCH 8/8] docs(mypy): update live-mode description --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index deb4aa8a..51aaa508 100644 --- a/package.json +++ b/package.json @@ -459,7 +459,7 @@ "type": "boolean", "order": 1, "default": true, - "description": "Turn on live mode (If disabled, mypy linters on file save)." + "description": "Turn on live mode. If disabled, mypy linters on file save. Note: Linting on file save may not work on all machines." } } },