Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Commit 9614529

Browse files
committed
Code cleanup #1
1 parent 0194e1e commit 9614529

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

src/extensions/default/PhpTooling/CodeHintsProvider.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ define(function (require, exports, module) {
5454
this.defaultCodeHintProviders = new DefaultProviders.CodeHintsProvider(client);
5555
}
5656

57+
CodeHintsProvider.prototype.setClient = function (client) {
58+
this.defaultCodeHintProviders.setClient(client);
59+
};
60+
5761
function setStyleAndCacheToken($hintObj, token) {
5862
$hintObj.addClass('brackets-hints-with-type-details');
5963
$hintObj.data('completionItem', token);

src/extensions/default/PhpTooling/main.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,12 @@ define(function (require, exports, module) {
109109
var logErr = "PhpTooling: Can't reset client for : ";
110110
chProvider ? chProvider.setClient(_client) : console.log(logErr, "CodeHintsProvider");
111111
phProvider ? phProvider.setClient(_client) : console.log(logErr, "ParameterHintsProvider");
112-
lProvider ? lProvider.setClient(_client) : console.log(logErr, "LintingProvider");
113112
jdProvider ? jdProvider.setClient(_client) : console.log(logErr, "JumpToDefProvider");
114113
dSymProvider ? dSymProvider.setClient(_client) : console.log(logErr, "DocumentSymbolsProvider");
115114
pSymProvider ? pSymProvider.setClient(_client) : console.log(logErr, "ProjectSymbolsProvider");
116115
refProvider ? refProvider.setClient(_client) : console.log(logErr, "FindReferencesProvider");
116+
lProvider ? lProvider.setClient(_client) : console.log(logErr, "LintingProvider");
117+
_client.addOnCodeInspection(lProvider.setInspectionResults.bind(lProvider));
117118
}
118119

119120
function registerToolingProviders() {
@@ -266,13 +267,7 @@ define(function (require, exports, module) {
266267
serverCapabilities = result.capabilities;
267268
handlePostPhpServerStart();
268269
});
269-
}).fail(function (err) {
270-
showErrorPopUp(err);
271-
//Retry on next active editor change
272-
EditorManager.on("activeEditorChange.php", activeEditorChangeHandler);
273-
LanguageManager.on("languageModified.php", languageModifiedHandler);
274-
activeEditorChangeHandler(null, EditorManager.getActiveEditor());
275-
});
270+
}).fail(showErrorPopUp);
276271
}
277272
}
278273

src/languageTools/node/RegisterLanguageClientInfo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ function init(domainManager) {
296296
domainManager.emitEvent(domainName, "requestLanguageClientInfo", []);
297297
}
298298
//Allow the handler enough time to get registered on Brackets side.
299-
setTimeout(requestInfo, 250);
299+
setTimeout(requestInfo, 500);
300300
}
301301

302302
exports.init = init;

0 commit comments

Comments
 (0)