Merge pull request #185 from codota/upgrade-api-version

upgrade api version to 3.5.34
codota · Aug 4, 2021 · 43644d0 · 43644d0
2 parents 802c2f2 + d068136
commit 43644d0
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 4 deletions.
diff --git a/src/main/java/com/tabnine/binary/requests/autocomplete/ResultEntry.java b/src/main/java/com/tabnine/binary/requests/autocomplete/ResultEntry.java
@@ -1,5 +1,6 @@
 package com.tabnine.binary.requests.autocomplete;
 
+import com.tabnine.general.CompletionKind;
 import com.tabnine.general.CompletionOrigin;
 
 public class ResultEntry {
@@ -10,5 +11,6 @@ public class ResultEntry {
     public CompletionOrigin origin;
     public String detail;
     public Boolean deprecated;
+    public CompletionKind completion_kind;
     // TODO other lsp types
 }
diff --git a/src/main/java/com/tabnine/binary/requests/selection/SelectionRequest.java b/src/main/java/com/tabnine/binary/requests/selection/SelectionRequest.java
@@ -1,6 +1,7 @@
 package com.tabnine.binary.requests.selection;
 
 import com.google.gson.annotations.SerializedName;
+import com.tabnine.general.CompletionKind;
 import com.tabnine.general.CompletionOrigin;
 
 import java.util.List;
@@ -38,4 +39,6 @@ public class SelectionRequest {
     @SerializedName(value = "num_of_lsp_suggestions")
     public Integer lspSuggestionsCount;
     public List<SelectionSuggestionRequest> suggestions;
+    @SerializedName(value = "completion_kind")
+    public CompletionKind completionKind;
 }
diff --git a/src/main/java/com/tabnine/binary/requests/selection/SetStateBinaryRequest.java b/src/main/java/com/tabnine/binary/requests/selection/SetStateBinaryRequest.java
@@ -7,7 +7,7 @@
 import static java.util.Collections.singletonMap;
 
 public class SetStateBinaryRequest implements BinaryRequest<SetStateBinaryResponse> {
-    private SelectionRequest selectionRequest;
+    private final SelectionRequest selectionRequest;
 
     public SetStateBinaryRequest(SelectionRequest selectionRequest) {
         this.selectionRequest = selectionRequest;

diff --git a/src/main/java/com/tabnine/general/CompletionKind.java b/src/main/java/com/tabnine/general/CompletionKind.java
@@ -0,0 +1,6 @@
+package com.tabnine.general;
+
+public enum CompletionKind {
+    Classic,
+    Line
+}
diff --git a/src/main/java/com/tabnine/general/StaticConfig.java b/src/main/java/com/tabnine/general/StaticConfig.java
@@ -20,7 +20,7 @@ public class StaticConfig {
     public static final String TABNINE_PLUGIN_ID_RAW = "com.tabnine.TabNine";
     public static final PluginId TABNINE_PLUGIN_ID = PluginId.getId(TABNINE_PLUGIN_ID_RAW);
     public static final int MAX_COMPLETIONS = 5;
-    public static final String BINARY_PROTOCOL_VERSION = "3.2.71";
+    public static final String BINARY_PROTOCOL_VERSION = "3.5.34";
     public static final int COMPLETION_TIME_THRESHOLD = 1000;
     public static final int ILLEGAL_RESPONSE_THRESHOLD = 5;
     public static final int CONSECUTIVE_RESTART_THRESHOLD = 5;

diff --git a/src/main/java/com/tabnine/intellij/completions/TabNineCompletionContributor.java b/src/main/java/com/tabnine/intellij/completions/TabNineCompletionContributor.java
@@ -103,7 +103,8 @@ private LookupElement createCompletion(CompletionParameters parameters, Completi
                 resultSet.getPrefixMatcher().getPrefix(),
                 getCursorPrefix(parameters),
                 getCursorSuffix(parameters),
-                result.origin
+                result.origin,
+                result.completion_kind
         );
 
         completion.detail = result.detail;

diff --git a/src/main/java/com/tabnine/prediction/TabNineCompletion.java b/src/main/java/com/tabnine/prediction/TabNineCompletion.java
@@ -1,5 +1,6 @@
 package com.tabnine.prediction;
 
+import com.tabnine.general.CompletionKind;
 import com.tabnine.general.CompletionOrigin;
 
 public class TabNineCompletion {
@@ -12,11 +13,12 @@ public class TabNineCompletion {
     public String cursorPrefix;
     public String cursorSuffix;
     public CompletionOrigin origin;
+    public CompletionKind completionKind;
 
     public String detail = null;
     public boolean deprecated = false;
 
-    public TabNineCompletion(String oldPrefix, String newPrefix, String oldSuffix, String newSuffix, int index, String completionPrefix, String cursorPrefix, String cursorSuffix, CompletionOrigin origin) {
+    public TabNineCompletion(String oldPrefix, String newPrefix, String oldSuffix, String newSuffix, int index, String completionPrefix, String cursorPrefix, String cursorSuffix, CompletionOrigin origin, CompletionKind completionKind) {
         this.oldPrefix = oldPrefix;
         this.newPrefix = newPrefix;
         this.oldSuffix = oldSuffix;
@@ -26,6 +28,7 @@ public TabNineCompletion(String oldPrefix, String newPrefix, String oldSuffix, S
         this.cursorPrefix = cursorPrefix;
         this.cursorSuffix = cursorSuffix;
         this.origin = origin;
+        this.completionKind = completionKind;
     }
 
     public CompletionOrigin getOrigin() {

diff --git a/src/main/java/com/tabnine/selections/TabNineLookupListener.java b/src/main/java/com/tabnine/selections/TabNineLookupListener.java
@@ -73,6 +73,7 @@ public void itemSelected(@NotNull LookupEvent event) {
             selection.origin = item.origin;
             selection.length = item.newPrefix.length();
             selection.strength = getStrength(item);
+            selection.completionKind = item.completionKind;
             addSuggestionsCount(selection, suggestions);
 
             binaryRequestFacade.executeRequest(new SetStateBinaryRequest(selection));