Code cleanup

Author: shubhsnov

src/extensions/default/PhpTooling/PHPSymbolProviders.js

@@ -22,7 +22,7 @@
  */
 
 /*jslint regexp: true */
-
+/*eslint no-invalid-this: 0, max-len: 0*/
 define(function (require, exports, module) {
     "use strict";
 
@@ -34,6 +34,12 @@ define(function (require, exports, module) {
 
     var SymbolKind = QuickOpen.SymbolKind;
 
+    function setClient(client) {
+        if (client) {
+            this.client = client;
+        }
+    }
+
     function convertRangePosToEditorPos(rangePos) {
         return {
             line: rangePos.line,
@@ -112,6 +118,8 @@ define(function (require, exports, module) {
         this.client = client;
     }
 
+    DocumentSymbolsProvider.prototype.setClient = setClient;
+
     DocumentSymbolsProvider.prototype.match = function (query) {
         return query.startsWith("@");
     };
@@ -171,6 +179,8 @@ define(function (require, exports, module) {
         this.client = client;
     }
 
+    ProjectSymbolsProvider.prototype.setClient = setClient;
+
     ProjectSymbolsProvider.prototype.match = function (query) {
         return query.startsWith("#");
     };

src/extensions/default/PhpTooling/main.js

@@ -62,13 +62,14 @@ define(function (require, exports, module) {
         phpServerRunning = false,
         serverCapabilities,
         currentRootPath,
-        chProvider,
-        phProvider,
-        lProvider,
-        jdProvider,
-        dSymProvider,
-        pSymProvider,
-        refProvider;
+        chProvider = null,
+        phProvider = null,
+        lProvider = null,
+        jdProvider = null,
+        dSymProvider = null,
+        pSymProvider = null,
+        refProvider = null,
+        providersRegistered = false;
 
     PreferencesManager.definePreference("php", "object", phpConfig, {
         description: Strings.DESCRIPTION_PHP_TOOLING_CONFIGURATION
@@ -104,11 +105,22 @@ define(function (require, exports, module) {
         }
     };
 
+    function resetClientInProviders() {
+        var logErr = "PhpTooling: Can't reset client for : ";
+        chProvider ? chProvider.setClient(_client) : console.log(logErr, "CodeHintsProvider");
+        phProvider ? phProvider.setClient(_client) : console.log(logErr, "ParameterHintsProvider");
+        lProvider ? lProvider.setClient(_client) : console.log(logErr, "LintingProvider");
+        jdProvider ? jdProvider.setClient(_client) : console.log(logErr, "JumpToDefProvider");
+        dSymProvider ? dSymProvider.setClient(_client) : console.log(logErr, "DocumentSymbolsProvider");
+        pSymProvider ? pSymProvider.setClient(_client) : console.log(logErr, "ProjectSymbolsProvider");
+        refProvider ? refProvider.setClient(_client) : console.log(logErr, "FindReferencesProvider");
+    }
+
     function registerToolingProviders() {
         chProvider = new CodeHintsProvider(_client),
-            phProvider = new DefaultProviders.ParameterHintsProvider(_client),
-            lProvider = new DefaultProviders.LintingProvider(_client),
-            jdProvider = new DefaultProviders.JumpToDefProvider(_client);
+        phProvider = new DefaultProviders.ParameterHintsProvider(_client),
+        lProvider = new DefaultProviders.LintingProvider(_client),
+        jdProvider = new DefaultProviders.JumpToDefProvider(_client);
         dSymProvider = new SymbolProviders.DocumentSymbolsProvider(_client);
         pSymProvider = new SymbolProviders.ProjectSymbolsProvider(_client);
         refProvider = new DefaultProviders.ReferencesProvider(_client);
@@ -148,6 +160,8 @@ define(function (require, exports, module) {
         CommandManager.get(Commands.NAVIGATE_GOTO_DEFINITION_PROJECT).setEnabled(true);
 
         _client.addOnCodeInspection(lProvider.setInspectionResults.bind(lProvider));
+
+        providersRegistered = true;
     }
 
     function addEventHandlers() {
@@ -221,7 +235,13 @@ define(function (require, exports, module) {
     function handlePostPhpServerStart() {
         if (!phpServerRunning) {
             phpServerRunning = true;
-            registerToolingProviders();
+
+            if (providersRegistered) {
+                resetClientInProviders();
+            } else {
+                registerToolingProviders();
+            }
+
             addEventHandlers();
             EditorManager.off("activeEditorChange.php");
             LanguageManager.off("languageModified.php");
@@ -275,8 +295,13 @@ define(function (require, exports, module) {
         }
     }
 
-    function initiateService() {
-        console.log("Php tooling: Starting the service");
+    function initiateService(onAppReady) {
+        if (onAppReady) {
+            console.log("Php tooling: Starting the service");
+        } else {
+            console.log("Php tooling: Something went wrong. Restarting the service");
+        }
+
         phpServerRunning = false;
         LanguageTools.initiateToolingService(clientName, clientFilePath, ['php']).done(function (client) {
             _client = client;
@@ -291,8 +316,8 @@ define(function (require, exports, module) {
     }
 
     AppInit.appReady(function () {
-        initiateService();
-        ClientLoader.on("clientsReloaded", initiateService);
+        initiateService(true);
+        ClientLoader.on("languageClientModuleInitialized", initiateService);
     });
 
     //Only for Unit testing

src/languageTools/ClientLoader.js

@@ -45,9 +45,7 @@ define(function (require, exports, module) {
         clientInfoLoadedPromise = null,
         //Clients that have to be loaded once the LanguageClient info is successfully loaded on the
         //node side.
-        pendingClientsToBeLoaded = [],
-        //list of the client which have to be loaded
-        clientMap = {};
+        pendingClientsToBeLoaded = [];
 
     function syncPrefsWithDomain(languageToolsPrefs) {
         if (clientInfoDomain) {
@@ -104,7 +102,6 @@ define(function (require, exports, module) {
     function initiateLanguageClient(clientName, clientFilePath) {
         var result = $.Deferred();
 
-        clientMap[clientName] = clientFilePath;
         //Only load clients after the LanguageClient Info has been initialized
         if (!clientInfoLoadedPromise || clientInfoLoadedPromise.state() === "pending") {
             var pendingClient = {
@@ -129,14 +126,7 @@ define(function (require, exports, module) {
                     pendingClient.load();
                 });
             } else {
-                //the node process might have restarted, so try loading all the clients again
-//                console.log("Reloading clients due to Node process crash...");
-//                var clients = Object.keys(clientMap);
-//                clients.forEach(function (client) {
-//                    var clientPromise = $.Deferred();
-//                    _clientLoader(client, clientMap[client], clientPromise);
-//                });
-                exports.trigger("clientsReloaded");
+                exports.trigger("languageClientModuleInitialized");
             }
             pendingClientsToBeLoaded = null;
         }, function () {

src/languageTools/DefaultProviders.js

@@ -23,7 +23,7 @@
 
 /*global Map*/
 /* eslint-disable indent */
-/* eslint max-len: ["error", { "code": 200 }]*/
+/* eslint max-len: ["error", { "code": 200 }], no-invalid-this: 0*/
 define(function (require, exports, module) {
     "use strict";
 
@@ -44,12 +44,20 @@ define(function (require, exports, module) {
 
     ExtensionUtils.loadStyleSheet(module, "styles/default_provider_style.css");
 
+    function setClient(client) {
+        if (client) {
+            this.client = client;
+        }
+    }
+
     function CodeHintsProvider(client) {
         this.client = client;
         this.query = "";
         this.ignoreQuery = ["-", "->", ">", ":", "::", "(", "()", ")", "[", "[]", "]", "{", "{}", "}"];
     }
 
+    CodeHintsProvider.prototype.setClient = setClient;
+
     function formatTypeDataForToken($hintObj, token) {
         $hintObj.addClass('brackets-hints-with-type-details');
         if (token.detail) {
@@ -197,6 +205,8 @@ define(function (require, exports, module) {
         this.client = client;
     }
 
+    ParameterHintsProvider.prototype.setClient = setClient;
+
     ParameterHintsProvider.prototype.hasParameterHints = function (editor, implicitChar) {
         if (!this.client) {
             return false;
@@ -273,6 +283,8 @@ define(function (require, exports, module) {
         this.client = client;
     }
 
+    JumpToDefProvider.prototype.setClient = setClient;
+
     JumpToDefProvider.prototype.canJumpToDef = function (editor, implicitChar) {
         if (!this.client) {
             return false;
@@ -342,6 +354,8 @@ define(function (require, exports, module) {
         this._validateOnType = false;
     }
 
+    LintingProvider.prototype.setClient = setClient;
+
     LintingProvider.prototype.clearExistingResults = function (filePath) {
         var filePathProvided = !!filePath;
 
@@ -451,6 +465,8 @@ define(function (require, exports, module) {
         this.client = client;
     }
 
+    ReferencesProvider.prototype.setClient = setClient;
+
     ReferencesProvider.prototype.hasReferences = function() {
         if (!this.client) {
             return false;

src/languageTools/node/RegisterLanguageClientInfo.js

@@ -285,18 +285,18 @@ function init(domainManager) {
         ],
         []
     );
-    
+
     domainManager.registerEvent(
         domainName,
         "requestLanguageClientInfo",
-        []
+        [] //no parameters
     );
-    
+
     function requestInfo() {
         domainManager.emitEvent(domainName, "requestLanguageClientInfo", []);
     }
     //Allow the handler enough time to get registered on Brackets side.
-    setTimeout(requestInfo, 500); 
+    setTimeout(requestInfo, 250);
 }
 
 exports.init = init;