Add icon to the bottom bar

Author: bazitur

.gitattributes

@@ -1 +1 @@
-pythonfiles/parso linguist-vendored
+pythonfiles/parso linguist-vendored=true

PyStatus.js

@@ -0,0 +1,25 @@
+/* global define, $ */
+define(function (require, exports, module) {
+    "use strict";
+    var status;
+
+    function PyStatus (handler) {
+        status = $('<div id="python-tools-status">');
+        $("#status-overwrite").after(status);
+        status.after($('<div id="python-tools-status-dummy">'));
+        status.on("click", handler);
+    }
+
+    PyStatus.prototype.update = function (cls, title) {
+        status.removeClass();
+        status.addClass(cls);
+
+        title = title || null;
+        if (title)
+            status.attr("title", title);
+        else
+            status.removeAttr("title");
+    }
+
+    module.exports = PyStatus;
+});

icons/README.md

@@ -0,0 +1,2 @@
+These icons are taken from [Public Icons Project](https://github.com/davidmerfield/Public-Icons) and edited to match Brackets' UX.
+Python logos are trademarks of the Python Software Foundation.

icons/denied.svg

@@ -63,16 +63,19 @@ define(function (require, exports, module) {
 
     var SETTINGS_CMD_ID  = EXTENSION_NAME + ".settings";
 
-    var PyHints = require("PyHints"),
-        PyDocs  = require("PyDocs"),
-        PyLint  = require("PyLint"),
-        PyGoto  = require("PyGoto");
+    var PyHints  = require("PyHints"),
+        PyDocs   = require("PyDocs"),
+        PyLint   = require("PyLint"),
+        PyGoto   = require("PyGoto"),
+        PyStatus = require("PyStatus");
 
     var SCRIPT_FULL_PATH = ExtensionUtils.getModulePath(module, 'pythonfiles/python_utils.py');
     var PYTHON_DIRECTORY = ExtensionUtils.getModulePath(module, 'pythonfiles/');
 
     var pythonDomain = new NodeDomain("python-tools", ExtensionUtils.getModulePath(module, "node/PythonDomain"));
 
+    var status = new PyStatus(handleSettings);
+
     preferences.definePreference("pathToPython", "string", "python", {
         description: LocalStrings.PATH_TO_PYTHON_TITLE,
         validator: function (value) {
@@ -180,6 +183,7 @@ define(function (require, exports, module) {
     }
 
     function setUpPythonShell () {
+        status.update("loading", LocalStrings.SHELL_CONNECTING);
         pythonDomain.exec("setSettings", {
             pythonPath: preferences.get("pathToPython"),
             pythonScript: SCRIPT_FULL_PATH,
@@ -193,7 +197,7 @@ define(function (require, exports, module) {
                             "is_case_sensitive": preferences.get("isCaseSensitive")
                         }
                     }).done(function (data) {
-                        console.log("Established connnection with Python Shell…");
+                        status.update("connected", LocalStrings.SHELL_CONNECTED);
                     }).fail(function(error) {
                         internalError(error);
                     });
@@ -208,6 +212,7 @@ define(function (require, exports, module) {
      * @param {string} error error text
      */
     function internalError (error) {
+        status.update("error", LocalStrings.SHELL_ERROR);
         Dialogs.showModalDialog(
             "python-tools-error",
             LocalStrings.ERROR_TITLE,
@@ -230,7 +235,6 @@ define(function (require, exports, module) {
             python_goto  = new PyGoto(pythonAPI).goto;
         // NOTICE: EditorManager requires jump to definition provider to be a function.
         // Thus, passing method to EditorManager.
-
         CodeHintManager.registerHintProvider(python_hints, ["python"], 9);
         EditorManager.registerInlineDocsProvider(python_docs);
         EditorManager.registerJumpToDefProvider(python_goto);
@@ -252,8 +256,11 @@ define(function (require, exports, module) {
         menu.addMenuDivider();
         menu.addMenuItem(SETTINGS_CMD_ID, "Ctrl-Alt-Y");
 
-        ExtensionUtils.loadStyleSheet(module, "styles/hints.less");
-        ExtensionUtils.loadStyleSheet(module, "styles/docs.less");
-        ExtensionUtils.loadStyleSheet(module, "styles/modals.css");
+        ["hints.less",
+         "docs.less",
+         "modals.css",
+         "spinner.css"].forEach(function (stylesheet) {
+            ExtensionUtils.loadStyleSheet(module, "styles/" + stylesheet);
+        });
     });
 });

icons/gear.svg

@@ -3,8 +3,11 @@ define({
     PATH_TO_PYTHON_TITLE:        "Path to Python executable",
     IS_CASE_SENSITIVE_TITLE:     "Use case sensitive completion",
     MAX_LINE_LENGTH_TITLE:       "Maximum line length in Python files",
-    IGNORED_ERRORS_TITLE:        "Array of errors which should be ignored by Python Linter",
+    IGNORED_ERRORS_TITLE:        "Array of errors ignored by Python Linter",
     ERROR_TITLE:                 "Python Tools Error",
     ERROR_TEXT:                  "Error text",
-    ERROR_NOTICE:                "Python Tools requires python shell and <code>jedi</code> module to work. Make sure you've provided correct path for Python executable and installed <code>jedi</code>. See <a href='{{ HOMEPAGE_REF }}'>Project home</a> for support."
+    ERROR_NOTICE:                "Python Tools requires python shell and <code>jedi</code> module to work. Make sure you've provided correct path for Python executable and installed <code>jedi</code>. See <a href='{{ HOMEPAGE_REF }}'>Project home</a> for support.",
+    SHELL_CONNECTING:           "Connecting to Python shell…",
+    SHELL_CONNECTED:            "Connected to Python shell",
+    SHELL_ERROR:                "Error in Python shell"
 });

icons/python-logo.svg

@@ -6,5 +6,8 @@ define({
     IGNORED_ERRORS_TITLE:        "Массив ошибок, игнорируемых Линтером Python",
     ERROR_TITLE:                 "Ошибка инструментов Python",
     ERROR_TEXT:                  "Текст ошибки",
-    ERROR_NOTICE:                "Для нормальной работы инструментов Python требуется работающий Python и модуль <code>jedi</code>. Убедитесь, что в настройках указан правильный путь к интерпретатору Python и установлен модуль <code>jedi</code>. Вы можете найти помощь на <a href='{{ HOMEPAGE_REF }}'>сайте проекта</a>."
+    ERROR_NOTICE:                "Для нормальной работы инструментов Python требуется работающий Python и модуль <code>jedi</code>. Убедитесь, что в настройках указан правильный путь к интерпретатору Python и установлен модуль <code>jedi</code>. Вы можете найти помощь на <a href='{{ HOMEPAGE_REF }}'>сайте проекта</a>.",
+    SHELL_CONNECTING:           "Подключение к оболочке Python…",
+    SHELL_CONNECTED:            "Подключён к оболочке Python",
+    SHELL_ERROR:                "Ошибка в оболочке Python"
 });

main.js

@@ -29,8 +29,15 @@
     };
 
     PythonShell.prototype.handleData = function (buffer) {
+        var data;
+        try {
+            data = JSON.parse(buffer.toString());
+        } catch (error) {
+            data = null;
+            var err = error;
+        }
         if (this.callBack) {
-            this.callBack(null, JSON.parse(buffer.toString()));
+            data !== null? this.callBack(null, data) : this.callBack(err, null);
         } else {
             console.error("Unhandled data");
         }
@@ -39,6 +46,8 @@
     PythonShell.prototype.handleError = function (errorBuffer) {
         var error = errorBuffer.toString();
         // should not restart the process there, may continue infinitely
+        this.needsRestart = true;
+
         if (this.callBack) {
             this.callBack(error, null);
         } else {
@@ -57,7 +66,10 @@
     };
 
     PythonShell.prototype.start = function (callBack) {
-        if (this.process) {
+        if (this.process && this.process.connected
+            && (!this.process.killed) && (!this.needsRestart)) {
+            callBack(null, true);   // cache normal process
+        } else if (this.process) {
             this.process.kill();
             this.needsRestart = false;
         }