Skip to content

Commit aa8f8da

Browse files
committed
fix: refactor calls to the languageclient
1 parent 41fca07 commit aa8f8da

File tree

6 files changed

+12
-19
lines changed

6 files changed

+12
-19
lines changed

plugin/src/main/java/io/snyk/eclipse/plugin/analytics/TaskProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static TaskProcessor getInstance() {
4141
private void start() {
4242
while (true) {
4343
String authToken = Preferences.getInstance().getAuthToken();
44-
var lc = SnykExtendedLanguageClient.getInstance();
44+
SnykExtendedLanguageClient lc = SnykExtendedLanguageClient.getInstance();
4545
if (taskQueue.isEmpty() || authToken == null || authToken.isBlank() || lc == null) {
4646
try {
4747
Thread.sleep(1000);

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/BaseBranchDialog.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ public void widgetSelected(SelectionEvent e) {
5050
folderConfigs.setBaseBranch(projectPath, selectedBranch);
5151
shell.close();
5252
CompletableFuture.runAsync(() -> {
53-
SnykExtendedLanguageClient.getInstance().triggerScan(projectPath);
53+
SnykExtendedLanguageClient lc = SnykExtendedLanguageClient.getInstance();
54+
lc.triggerScan(projectPath);
5455
});
5556
} else {
5657
SnykLogger.logInfo("Branch is not a valid local branch for repository: " + projectPath);

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SummaryBrowserHandler.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ public Object function(Object[] arguments) {
2727
}
2828

2929
Preferences.getInstance().store(Preferences.ENABLE_DELTA, Boolean.toString(value));
30-
updateConfiguration();
30+
31+
CompletableFuture.runAsync(() -> SnykExtendedLanguageClient.getInstance().updateConfiguration());
3132

3233
return null;
3334
}
@@ -36,14 +37,6 @@ public Object function(Object[] arguments) {
3637
setDefaultBrowserText();
3738
}
3839

39-
private void updateConfiguration() {
40-
CompletableFuture.runAsync(() -> {
41-
// Update the Snyk Language Server configuration.
42-
final var lc = SnykExtendedLanguageClient.getInstance();
43-
lc.updateConfiguration();
44-
});
45-
}
46-
4740
public void setDefaultBrowserText() {
4841
browser.setText(StaticPageHtmlProvider.getInstance().getSummaryInitHtml());
4942
}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/BaseProductFilterHandler.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
2222

2323
// now we can apply the filter
2424
new ProductFilter(TreeFilterManager.getInstance(), filterName).applyFilter();
25-
26-
final var lc = SnykExtendedLanguageClient.getInstance();
27-
lc.updateConfiguration();
28-
25+
26+
SnykExtendedLanguageClient.getInstance().updateConfiguration();
27+
2928
return returnValue;
3029
}
3130
}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterNetNewIssuesHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
3232

3333
CompletableFuture.runAsync(() -> {
3434
// Update the Snyk Language Server configuration.
35-
final var lc = SnykExtendedLanguageClient.getInstance();
35+
SnykExtendedLanguageClient lc = SnykExtendedLanguageClient.getInstance();
3636
lc.updateConfiguration();
3737
lc.triggerScan(null);
3838
});

plugin/src/main/java/io/snyk/eclipse/plugin/wizards/SnykWizardModel.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ public void resetPreferences() {
1919
Preferences.getInstance().setIsInsecure(initialUnknownCerts);
2020
Preferences.getInstance().store(Preferences.AUTH_TOKEN_KEY, initialAuthToken);
2121

22-
SnykExtendedLanguageClient client = SnykExtendedLanguageClient.getInstance();
22+
SnykExtendedLanguageClient lc = SnykExtendedLanguageClient.getInstance();
2323
// The language client may be null when the extension first loads, so only update configuration if we are able.
24-
if (client != null) {
25-
client.updateConfiguration();
24+
if (lc != null) {
25+
lc.updateConfiguration();
2626
};
2727
}
2828
}

0 commit comments

Comments
 (0)