Upgrade VSCode dependency to version 1.55

Signed-off-by: Tal Wertheimer <[email protected]>

package.json

@@ -137,7 +137,7 @@
     "@types/sinon": "^9.0.11",
     "@types/tmp": "^0.2.0",
     "@types/underscore": "^1.11.15",
-    "@types/vscode": "^1.50.0",
+    "@types/vscode": "^1.55.0",
     "@types/yauzl": "^2.9.1",
     "@typescript-eslint/eslint-plugin": "^5.45.0",
     "@typescript-eslint/parser": "^4.18.0",

src/assistant/diagnostics.ts

@@ -61,7 +61,7 @@ const cancellationToken = new CancellationToken();
 
 function getRelevantRange(
   document: vscode.TextDocument,
-  visibleRanges: vscode.Range[]
+  visibleRanges: readonly vscode.Range[]
 ): vscode.Range | undefined {
   const firstEditingPosition = changesTrackMap.get(document.uri);
   const visibleRange = visibleRanges.reduce((accumulator, currentValue) =>
@@ -79,7 +79,7 @@ function getRelevantRange(
 async function refreshDiagnostics(
   document: vscode.TextDocument,
   diagnosticsCollection: vscode.DiagnosticCollection,
-  visibleRanges: vscode.Range[]
+  visibleRanges: readonly vscode.Range[]
 ): Promise<void> {
   cancellationToken.cancel();
   const lock = await mutex.acquire();

src/authentication/TabnineAuthenticationProvider.ts

@@ -125,19 +125,24 @@ export default class TabnineAuthenticationProvider
     if (!last && current) {
       this.sessionsChangeEventEmitter.fire({
         added: [toSession(current)],
+        removed: undefined,
+        changed: undefined
       });
     }
 
     if (last && !current) {
       this.sessionsChangeEventEmitter.fire({
         removed: [toSession(last)],
+        added: undefined,
+        changed: undefined
       });
     }
 
     if (last && current) {
       this.sessionsChangeEventEmitter.fire({
         removed: [toSession(last)],
         added: [toSession(current)],
+        changed: undefined
       });
     }
   }

src/debounceCompletions.ts

@@ -1,7 +1,6 @@
 import * as vscode from "vscode";
 import { Capability, isCapabilityEnabled } from "./capabilities/capabilities";
 import getInlineCompletionItems from "./getInlineCompletionItems";
-import TabnineInlineCompletionItem from "./inlineSuggestions/tabnineInlineCompletionItem";
 import { sleep, timed } from "./utils/utils";
 
 const ALPHA_ONE_SECOND_DEBOUNCE = 1000;
@@ -11,7 +10,7 @@ export default async function debounceCompletions(
   position: vscode.Position,
   token: vscode.CancellationToken
 ): Promise<
-  vscode.InlineCompletionList<TabnineInlineCompletionItem> | undefined
+  vscode.InlineCompletionList | undefined
 > {
   const { time, value: current } = await timed(() =>
     getInlineCompletionItems(document, position, token)

src/getInlineCompletionItems.ts

@@ -10,7 +10,7 @@ export default async function getInlineCompletionItems(
   document: vscode.TextDocument,
   position: vscode.Position,
   cancellationToken: vscode.CancellationToken
-): Promise<vscode.InlineCompletionList<TabnineInlineCompletionItem>> {
+): Promise<vscode.InlineCompletionList> {
   const response = await runCompletion({
     document,
     position,

src/inlineSuggestions/tabnineInlineCompletionItem.ts

@@ -14,7 +14,6 @@ export default class TabnineInlineCompletionItem extends InlineCompletionItem {
 
   snippetContext?: SnippetContext;
 
-  insertText?: string;
 
   constructor(
     text: string,

src/lookAheadSuggestion.ts

@@ -42,7 +42,7 @@ export async function getLookAheadSuggestion(
   { range, text }: SelectedCompletionInfo,
   position: Position,
   cancellationToken: CancellationToken
-): Promise<InlineCompletionList<TabnineInlineCompletionItem>> {
+): Promise<InlineCompletionList> {
   const textAtRange = document.getText(range);
   const isContainsCompletionInfo = text.startsWith(textAtRange);
 

src/provideInlineCompletionItems.ts

@@ -1,5 +1,4 @@
 import * as vscode from "vscode";
-import TabnineInlineCompletionItem from "./inlineSuggestions/tabnineInlineCompletionItem";
 import { completionIsAllowed } from "./provideCompletionItems";
 import { getShouldComplete } from "./inlineSuggestions/documentChangesTracker";
 import {
@@ -19,7 +18,7 @@ export default async function provideInlineCompletionItems(
   context: vscode.InlineCompletionContext,
   token: vscode.CancellationToken
 ): Promise<
-  vscode.InlineCompletionList<TabnineInlineCompletionItem> | undefined
+  vscode.InlineCompletionList | undefined
 > {
   try {
     clearCurrentLookAheadSuggestion();

src/reportSuggestionShown.ts

@@ -1,15 +1,15 @@
 import * as vscode from "vscode";
-import TabnineInlineCompletionItem from "./inlineSuggestions/tabnineInlineCompletionItem";
 import suggestionShown from "./binary/requests/suggestionShown";
 import { ResultEntry } from "./binary/requests/requests";
+import TabnineInlineCompletionItem from "./inlineSuggestions/tabnineInlineCompletionItem";
 
 let lastShownSuggestion: ResultEntry | undefined | null;
 
 export default function reportSuggestionShown(
   document: vscode.TextDocument,
-  completions?: vscode.InlineCompletionList<TabnineInlineCompletionItem>
+  completions?: vscode.InlineCompletionList
 ): void {
-  const item = completions?.items[0]?.suggestionEntry;
+  const item = (completions?.items[0] as TabnineInlineCompletionItem ).suggestionEntry;
 
   if (item && !lastShownSuggestion?.new_prefix.endsWith(item.new_prefix)) {
     void suggestionShown({

src/tabnineChatWidget/webviews/getIcon.ts

@@ -4,6 +4,7 @@ const LOGO_BY_THEME = {
   [ColorThemeKind.Dark]: "tabnine-logo-dark.svg",
   [ColorThemeKind.Light]: "tabnine-logo-light.svg",
   [ColorThemeKind.HighContrast]: "logo.svg",
+  [ColorThemeKind.HighContrastLight]: "logo-light.svg",
 };
 
 export function getIcon(context: ExtensionContext, view: Webview) {

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

@@ -10,7 +10,6 @@ import { SelectionStateRequest } from "../../../binary/requests/setState";
 import { CompletionArguments } from "../../../CompletionArguments";
 import { sleep } from "../../../utils/utils";
 import { TAB_OVERRIDE_COMMAND } from "../../../globals/consts";
-import TabnineInlineCompletionItem from "../../../inlineSuggestions/tabnineInlineCompletionItem";
 import provideInlineCompletionItems from "../../../provideInlineCompletionItems";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-argument
@@ -117,7 +116,7 @@ export async function triggerSelectionAcceptance(): Promise<void> {
 export async function getInlineCompletions(
   editor: vscode.TextEditor
 ): Promise<
-  vscode.InlineCompletionList<TabnineInlineCompletionItem> | undefined
+  vscode.InlineCompletionList | undefined
 > {
   return provideInlineCompletionItems(
     editor.document,

src/test/suite/utils/preReleaseInstaller.utils.ts

@@ -110,6 +110,9 @@ export async function runInstallation(
 export function getContext(contextGetMocks: ContextGetMocks): ExtensionContext {
   return {
     globalState: {
+      keys() {
+        return [];
+      },
       get: (key: string) => contextGetMocks[key],
       update: updateGlobalState,
     },

src/utils/logo.utils.ts

@@ -5,6 +5,7 @@ export const LOGO_BY_THEME = {
   [ColorThemeKind.Light]: "logo-dark.svg",
   [ColorThemeKind.Dark]: "logo-light.svg",
   [ColorThemeKind.HighContrast]: "logo.svg",
+  [ColorThemeKind.HighContrastLight]: "logo-light.svg",
 };
 
 export function getLogoPath(context: ExtensionContext): string {

src/utils/utils.ts

@@ -96,8 +96,9 @@ export function trimEnd(str: string, suffix: string): string {
   return str.replace(new RegExp(`${escapeRegExp(suffix)}$`), "");
 }
 
-export function escapeTabStopSign(value: string): string {
-  return value.replace(new RegExp("\\$", "g"), "\\$");
+export function escapeTabStopSign(value: string | vscode.SnippetString): string {
+  const val =  typeof value === "string"? value : value.value;
+  return val.replace(new RegExp("\\$", "g"), "\\$");
 }
 
 export function isMultiline(text?: string): boolean {

yarn.lock

@@ -332,10 +332,10 @@
   resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.15.tgz#29c776daecf6f1935da9adda17509686bf979947"
   integrity sha512-HP38xE+GuWGlbSRq9WrZkousaQ7dragtZCruBVMi0oX1migFZavZ3OROKHSkNp/9ouq82zrWtZpg18jFnVN96g==
 
-"@types/vscode@^1.50.0":
-  version "1.55.0"
-  resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.55.0.tgz#58cfbebbd32b3e374e07e7858b1fd0e92b1a1d2b"
-  integrity sha512-49hysH7jneTQoSC8TWbAi7nKK9Lc5osQNjmDHVosrcU8o3jecD9GrK0Qyul8q4aGPSXRfNGqIp9CBdb13akETg==
+"@types/vscode@^1.55.0":
+  version "1.85.0"
+  resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.85.0.tgz#46beb07f0f626665b52d1e2294382b2bc63b602e"
+  integrity sha512-CF/RBon/GXwdfmnjZj0WTUMZN5H6YITOfBCP4iEZlOtVQXuzw6t7Le7+cR+7JzdMrnlm7Mfp49Oj2TuSXIWo3g==
 
 "@types/yauzl@^2.9.1":
   version "2.9.1"