Code cleanup #1

adobe · Apr 24, 2019 · 9614529 · 9614529
1 parent 0194e1e
commit 9614529
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/extensions/default/PhpTooling/CodeHintsProvider.js b/src/extensions/default/PhpTooling/CodeHintsProvider.js
@@ -54,6 +54,10 @@ define(function (require, exports, module) {
         this.defaultCodeHintProviders = new DefaultProviders.CodeHintsProvider(client);
     }
 
+    CodeHintsProvider.prototype.setClient = function (client) {
+        this.defaultCodeHintProviders.setClient(client);
+    };
+
     function setStyleAndCacheToken($hintObj, token) {
         $hintObj.addClass('brackets-hints-with-type-details');
         $hintObj.data('completionItem', token);

diff --git a/src/extensions/default/PhpTooling/main.js b/src/extensions/default/PhpTooling/main.js
@@ -109,11 +109,12 @@ define(function (require, exports, module) {
         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");
+        lProvider ? lProvider.setClient(_client) : console.log(logErr, "LintingProvider");
+        _client.addOnCodeInspection(lProvider.setInspectionResults.bind(lProvider));
     }
 
     function registerToolingProviders() {
@@ -266,13 +267,7 @@ define(function (require, exports, module) {
                         serverCapabilities = result.capabilities;
                         handlePostPhpServerStart();
                     });
-                }).fail(function (err) {
-                    showErrorPopUp(err);
-                    //Retry on next active editor change
-                    EditorManager.on("activeEditorChange.php", activeEditorChangeHandler);
-                    LanguageManager.on("languageModified.php", languageModifiedHandler);
-                    activeEditorChangeHandler(null, EditorManager.getActiveEditor());
-                });
+                }).fail(showErrorPopUp);
         }
     }
 

diff --git a/src/languageTools/node/RegisterLanguageClientInfo.js b/src/languageTools/node/RegisterLanguageClientInfo.js
@@ -296,7 +296,7 @@ function init(domainManager) {
         domainManager.emitEvent(domainName, "requestLanguageClientInfo", []);
     }
     //Allow the handler enough time to get registered on Brackets side.
-    setTimeout(requestInfo, 250);
+    setTimeout(requestInfo, 500);
 }
 
 exports.init = init;