Skip to content

Commit f89c0db

Browse files
committed
Simplify completion parameter names
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
1 parent f0f7cbb commit f89c0db

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

src/main/java/nextflow/lsp/services/LanguageService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public LanguageService() {
109109
protected abstract ASTNodeCache getAstCache();
110110
protected CallHierarchyProvider getCallHierarchyProvider() { return null; }
111111
protected CodeLensProvider getCodeLensProvider() { return null; }
112-
protected CompletionProvider getCompletionProvider(int maxCompletionItems, boolean extendedCompletion) { return null; }
112+
protected CompletionProvider getCompletionProvider(int maxItems, boolean extended) { return null; }
113113
protected DefinitionProvider getDefinitionProvider() { return null; }
114114
protected FormattingProvider getFormattingProvider() { return null; }
115115
protected HoverProvider getHoverProvider() { return null; }
@@ -224,8 +224,8 @@ public List<CodeLens> codeLens(CodeLensParams params) {
224224
return provider.codeLens(params.getTextDocument());
225225
}
226226

227-
public Either<List<CompletionItem>, CompletionList> completion(CompletionParams params, int maxCompletionItems, boolean extendedCompletion) {
228-
var provider = getCompletionProvider(maxCompletionItems, extendedCompletion);
227+
public Either<List<CompletionItem>, CompletionList> completion(CompletionParams params, int maxItems, boolean extended) {
228+
var provider = getCompletionProvider(maxItems, extended);
229229
if( provider == null )
230230
return Either.forLeft(Collections.emptyList());
231231

src/main/java/nextflow/lsp/services/config/ConfigService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected ASTNodeCache getAstCache() {
5252
}
5353

5454
@Override
55-
protected CompletionProvider getCompletionProvider(int maxCompletionItems, boolean extendedCompletion) {
55+
protected CompletionProvider getCompletionProvider(int maxItems, boolean extended) {
5656
return new ConfigCompletionProvider(astCache);
5757
}
5858

src/main/java/nextflow/lsp/services/script/ScriptCompletionProvider.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ public class ScriptCompletionProvider implements CompletionProvider {
8888
private static Logger log = Logger.getInstance();
8989

9090
private ScriptAstCache ast;
91-
private boolean extendedCompletion;
92-
private int maxCompletionItems;
91+
private boolean extended;
92+
private int maxItems;
9393
private URI uri;
9494
private boolean isIncomplete = false;
9595

96-
public ScriptCompletionProvider(ScriptAstCache ast, int maxCompletionItems, boolean extendedCompletion) {
96+
public ScriptCompletionProvider(ScriptAstCache ast, int maxItems, boolean extended) {
9797
this.ast = ast;
98-
this.extendedCompletion = extendedCompletion;
99-
this.maxCompletionItems = maxCompletionItems;
98+
this.extended = extended;
99+
this.maxItems = maxItems;
100100
}
101101

102102
@Override
@@ -270,7 +270,7 @@ private void populateItemsFromScope(VariableScope scope, String namePrefix, ASTN
270270
}
271271
populateTypes(namePrefix, items);
272272

273-
if( !extendedCompletion ) {
273+
if( !extended ) {
274274
populateIncludes(namePrefix, items);
275275
return;
276276
}
@@ -507,7 +507,7 @@ else if( node instanceof Variable variable ) {
507507
}
508508

509509
private boolean addItem(CompletionItem item, List<CompletionItem> items) {
510-
if( items.size() >= maxCompletionItems ) {
510+
if( items.size() >= maxItems ) {
511511
isIncomplete = true;
512512
return false;
513513
}

src/main/java/nextflow/lsp/services/script/ScriptService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ protected CodeLensProvider getCodeLensProvider() {
7171
}
7272

7373
@Override
74-
protected CompletionProvider getCompletionProvider(int maxCompletionItems, boolean extendedCompletion) {
75-
return new ScriptCompletionProvider(astCache, maxCompletionItems, extendedCompletion);
74+
protected CompletionProvider getCompletionProvider(int maxItems, boolean extended) {
75+
return new ScriptCompletionProvider(astCache, maxItems, extended);
7676
}
7777

7878
@Override

0 commit comments

Comments
 (0)