DEV2-2022 use new api version 4.4.223 (#1016)

src/CompletionArguments.ts

@@ -1,13 +1,12 @@
 import { Position } from "vscode";
-import { ResultEntry, SnippetContext } from "./binary/requests/requests";
+import { ResultEntry } from "./binary/requests/requests";
 import { SuggestionTrigger } from "./globals/consts";
 
 export type CompletionArguments = {
   currentCompletion: string;
   completions: ResultEntry[];
   position: Position;
   limited: boolean;
-  snippetContext?: SnippetContext;
   oldPrefix?: string;
   suggestionTrigger?: SuggestionTrigger;
 };

src/binary/requests/requests.ts

@@ -18,20 +18,6 @@ export enum CompletionKind {
   Snippet = "Snippet",
 }
 
-export type ResultEntry = {
-  new_prefix: string;
-  old_suffix: string;
-  new_suffix: string;
-
-  kind?: vscode.CompletionItemKind;
-  origin?: CompletionOrigin;
-  detail?: string;
-  documentation?: string | MarkdownStringSpec;
-  deprecated?: boolean;
-  completion_kind?: CompletionKind;
-  is_cached?: boolean;
-};
-
 enum UserIntent {
   Comment,
   Block,
@@ -53,12 +39,29 @@ export interface SnippetContext extends Record<string, unknown> {
   intent_metadata?: SnippetIntentMetadata;
 }
 
+export type CompletionMetadata = {
+  kind?: vscode.CompletionItemKind;
+  origin?: CompletionOrigin;
+  detail?: string;
+  documentation?: string | MarkdownStringSpec;
+  deprecated?: boolean;
+  completion_kind?: CompletionKind;
+  is_cached?: boolean;
+  snippet_context?: SnippetContext;
+};
+
+export type ResultEntry = {
+  new_prefix: string;
+  old_suffix: string;
+  new_suffix: string;
+  completion_metadata?: CompletionMetadata;
+};
+
 export type AutocompleteResult = {
   old_prefix: string;
   results: ResultEntry[];
   user_message: string[];
   is_locked: boolean;
-  snippet_context?: SnippetContext;
 };
 
 export function initBinary(): Promise<void> {

src/binary/requests/suggestionShown.ts

@@ -1,12 +1,10 @@
-import CompletionOrigin from "../../CompletionOrigin";
-import { CompletionKind, tabNineProcess } from "./requests";
+import { CompletionMetadata, tabNineProcess } from "./requests";
 
 export interface SuggestionShown {
   SuggestionShown: {
-    origin: CompletionOrigin;
     net_length: number;
-    completion_kind?: CompletionKind;
     filename: string;
+    metadata?: CompletionMetadata;
   };
 }
 

src/getAutoImportCommand.ts

@@ -16,7 +16,7 @@ export default function getAutoImportCommand(
         completions: response?.results,
         position,
         limited: response?.is_locked,
-        snippetContext: response?.snippet_context,
+        snippetContext: result.completion_metadata?.snippet_context,
         oldPrefix: response?.old_prefix,
         suggestionTrigger,
       },

src/getInlineCompletionItems.ts

@@ -32,9 +32,9 @@ export default async function getInlineCompletionItems(
           position,
           SuggestionTrigger.DocumentChanged
         ),
-        result.completion_kind,
-        result.is_cached,
-        response.snippet_context
+        result.completion_metadata?.completion_kind,
+        result.completion_metadata?.is_cached,
+        result.completion_metadata?.snippet_context
       )
   );
 

src/globals/consts.ts

@@ -1,7 +1,7 @@
 import isCloudEnv from "../cloudEnvs/isCloudEnv";
 
 export const TABNINE_URL_QUERY_PARAM = "tabnineUrl";
-export const API_VERSION = "4.4.71";
+export const API_VERSION = "4.4.223";
 export const BINARY_UPDATE_URL = "https://update.tabnine.com/bundles";
 export const BINARY_UPDATE_VERSION_FILE_URL = `${BINARY_UPDATE_URL}/version`;
 export const ATTRIBUTION_BRAND = "⌬ ";

src/inlineSuggestions/hoverPopup.ts

@@ -32,7 +32,7 @@ function tryGetAlphaDebugContent(): string | null {
   if (isCapabilityEnabled(Capability.ALPHA_CAPABILITY)) {
     // eslint-disable-next-line @typescript-eslint/naming-convention
     const { completion_kind = "none", origin = "none" } =
-      getCurrentSuggestion() ?? {};
+      getCurrentSuggestion()?.completion_metadata ?? {};
     return `context - origin: ${origin} - kind: ${completion_kind}`;
   }
   return null;

src/inlineSuggestions/setInlineSuggestion.ts

@@ -100,7 +100,8 @@ async function showInlineDecoration(
   position: Position,
   suggestion: string
 ): Promise<void> {
-  const currentCompletionKind = getCurrentSuggestion()?.completion_kind;
+  const currentCompletionKind = getCurrentSuggestion()?.completion_metadata
+    ?.completion_kind;
   const decorations =
     currentCompletionKind === CompletionKind.Snippet
       ? await getSnippetDecorations(position, suggestion)

src/lookAheadSuggestion.ts

@@ -74,9 +74,9 @@ export async function getLookAheadSuggestion(
         position,
         SuggestionTrigger.LookAhead
       ),
-      result.completion_kind,
-      result.is_cached,
-      response.snippet_context
+      result.completion_metadata?.completion_kind,
+      result.completion_metadata?.is_cached,
+      result.completion_metadata?.snippet_context
     );
 
   currentLookAheadSuggestion = completion;

src/provideCompletionItems.ts

@@ -99,7 +99,7 @@ function makeCompletionItem(args: {
 
   item.filterText = args.entry.new_prefix;
   item.preselect = args.index === 0;
-  item.kind = args.entry.kind;
+  item.kind = args.entry.completion_metadata?.kind;
   item.range = new vscode.Range(
     args.position.translate(0, -args.oldPrefix.length),
     args.position.translate(0, args.entry.old_suffix.length)
@@ -127,8 +127,10 @@ function makeCompletionItem(args: {
       .appendText(escapeTabStopSign(args.entry.new_suffix));
   }
 
-  if (args.entry.documentation) {
-    item.documentation = formatDocumentation(args.entry.documentation);
+  if (args.entry.completion_metadata?.documentation) {
+    item.documentation = formatDocumentation(
+      args.entry.completion_metadata?.documentation
+    );
   }
 
   return item;
@@ -205,7 +207,13 @@ function showFew(
   document: vscode.TextDocument,
   position: vscode.Position
 ): boolean {
-  if (response.results.some((entry) => entry.kind || entry.documentation)) {
+  if (
+    response.results.some(
+      (entry) =>
+        entry.completion_metadata?.kind ||
+        entry.completion_metadata?.documentation
+    )
+  ) {
     return false;
   }
 

src/reportSuggestionShown.ts

@@ -1,7 +1,6 @@
 import * as vscode from "vscode";
 import TabnineInlineCompletionItem from "./inlineSuggestions/tabnineInlineCompletionItem";
 import suggestionShown from "./binary/requests/suggestionShown";
-import CompletionOrigin from "./CompletionOrigin";
 import { ResultEntry } from "./binary/requests/requests";
 
 let lastShownSuggestion: ResultEntry | undefined | null;
@@ -15,10 +14,9 @@ export default function reportSuggestionShown(
   if (item && !lastShownSuggestion?.new_prefix.endsWith(item.new_prefix)) {
     void suggestionShown({
       SuggestionShown: {
-        origin: item.origin ?? CompletionOrigin.UNKNOWN,
         net_length: item.new_prefix.length,
-        completion_kind: item.completion_kind,
         filename: document.fileName,
+        metadata: item.completion_metadata,
       },
     });
   }

src/selectionHandler.ts

@@ -16,7 +16,7 @@ import {
   DELAY_FOR_CODE_ACTION_PROVIDER,
   SuggestionTrigger,
 } from "./globals/consts";
-import { ResultEntry, SnippetContext } from "./binary/requests/requests";
+import { ResultEntry } from "./binary/requests/requests";
 import setState, {
   SelectionStateRequest,
   SetStateSuggestion,
@@ -45,7 +45,6 @@ export function getSelectionHandler(
       completions,
       position,
       limited,
-      snippetContext,
       oldPrefix,
       suggestionTrigger,
     }: CompletionArguments
@@ -58,7 +57,6 @@ export function getSelectionHandler(
         limited,
         editor,
         oldPrefix,
-        snippetContext,
         suggestionTrigger
       );
 
@@ -80,7 +78,6 @@ export function getSelectionHandler(
     limited: boolean,
     editor: TextEditor,
     oldPrefix?: string,
-    snippetContext?: SnippetContext,
     suggestionTrigger?: SuggestionTrigger
   ) {
     if (position && completions?.length) {
@@ -91,7 +88,6 @@ export function getSelectionHandler(
         editor,
         position,
         oldPrefix,
-        snippetContext,
         suggestionTrigger
       );
       void setState(eventData).then(() => {
@@ -114,7 +110,6 @@ function eventDataOf(
   editor: TextEditor,
   position: Position,
   oldPrefix?: string,
-  snippetContext?: SnippetContext,
   suggestionTrigger?: SuggestionTrigger
 ) {
   const index = completions.findIndex(
@@ -126,9 +121,10 @@ function eventDataOf(
   let numOfLspSuggestions = 0;
   let numOfVanillaKeywordSuggestions = 0;
   const currInCompletions = completions[index];
+  const snippetContext = currInCompletions.completion_metadata?.snippet_context;
 
   const suggestions: SetStateSuggestion[] = completions.map((c) => {
-    switch (c.origin) {
+    switch (c.completion_metadata?.origin) {
       case CompletionOrigin.VANILLA:
         numOfVanillaSuggestions += 1;
         break;
@@ -153,14 +149,14 @@ function eventDataOf(
     return {
       length: c.new_prefix.length,
       strength: resolveDetailOf(c),
-      origin: c.origin ?? CompletionOrigin.UNKNOWN,
+      origin: c.completion_metadata?.origin ?? CompletionOrigin.UNKNOWN,
     };
   });
 
   const { length } = currentCompletion;
   const netLength = length - (oldPrefix?.length || 0);
   const strength = resolveDetailOf(currInCompletions);
-  const { origin } = currInCompletions;
+  const { origin } = currInCompletions.completion_metadata ?? {};
   const prefixLength = editor.document
     .getText(new Range(new Position(position.line, 0), position))
     .trimLeft().length;
@@ -191,7 +187,7 @@ function eventDataOf(
       num_of_vanilla_keyword_suggestions: numOfVanillaKeywordSuggestions,
       suggestions,
       is_locked: limited,
-      completion_kind: currInCompletions.completion_kind,
+      completion_kind: currInCompletions.completion_metadata?.completion_kind,
       snippet_context: snippetContext,
       suggestion_trigger: suggestionTrigger,
     },
@@ -201,11 +197,11 @@ function eventDataOf(
 }
 
 function resolveDetailOf(completion: ResultEntry): string | undefined {
-  if (completion.origin === CompletionOrigin.LSP) {
+  if (completion.completion_metadata?.origin === CompletionOrigin.LSP) {
     return "";
   }
 
-  return completion.detail;
+  return completion.completion_metadata?.detail;
 }
 
 function extractLanguage(editor: TextEditor) {

src/test/suite/utils/completion.utils.ts

@@ -49,7 +49,6 @@ export function selectionCommandArgs(
     completions: result.results,
     position,
     limited: result.is_locked,
-    snippetContext: result.snippet_context,
     oldPrefix: result.old_prefix,
   };
 }

src/test/suite/utils/testData.ts

@@ -71,14 +71,18 @@ export function anAutocompleteResponse(
         new_prefix: newPrefix !== undefined ? newPrefix : A_SUGGESTION,
         old_suffix: oldSuffix,
         new_suffix: newSuffix,
-        origin: CompletionOrigin.VANILLA,
+        completion_metadata: {
+          origin: CompletionOrigin.VANILLA,
+        },
       },
       {
         new_prefix: ANOTHER_SUGGESTION,
-        detail: "5%",
         old_suffix: "",
         new_suffix: "",
-        origin: CompletionOrigin.LOCAL,
+        completion_metadata: {
+          detail: "5%",
+          origin: CompletionOrigin.LOCAL,
+        },
       },
     ],
     user_message: [""],