Merge branch 'main' into tl/add-support-link-for-cody-pro

lib/shared/src/chat/transcript/display-text.ts

@@ -1,7 +1,7 @@
 import type * as vscode from 'vscode'
 import type { URI } from 'vscode-uri'
 import type { ContextItem } from '../../codebase-context/messages'
-import type { RangeData } from '../../common/range'
+import { type RangeData, toRangeData } from '../../common/range'
 import { displayPath } from '../../editor/displayPath'
 import { reformatBotMessageForChat } from '../viewHelpers'
 import type { ChatMessage } from './messages'
@@ -41,17 +41,24 @@ function createDisplayTextWithFileLinks(humanInput: string, files: ContextItem[]
     for (const file of files) {
         // +1 on the end line numbers because we want to make sure to include everything on the end line by
         // including the next line at position 0.
-        formattedText = replaceFileNameWithMarkdownLink(
-            formattedText,
-            file.uri,
-            file.range
-                ? {
-                      start: { line: file.range.start.line, character: 0 },
-                      end: { line: file.range.end.line + 1, character: 0 },
-                  }
-                : undefined,
-            file.type === 'symbol' ? file.symbolName : undefined
-        )
+        const range = file.range ? toRangeData(file.range) : undefined
+        try {
+            formattedText = replaceFileNameWithMarkdownLink(
+                formattedText,
+                file.uri,
+                range
+                    ? {
+                          start: { line: range.start.line, character: 0 },
+                          end: { line: range.end.line + 1, character: 0 },
+                      }
+                    : undefined,
+                file.type === 'symbol' ? file.symbolName : undefined
+            )
+        } catch (error) {
+            console.error('createDisplayTextWithFileLinks error:', error)
+            // Just use text without links as a fallback. This can happen on chat history that was
+            // serialized using an old and unrecognized format, which is a subtle bug.
+        }
     }
     return formattedText
 }

vscode/CHANGELOG.md

@@ -13,6 +13,12 @@ This is a log of all notable changes to Cody for VS Code. [Unreleased] changes a
 - Autocomplete: Upgrade tree-sitter and expand language support. [pull/3373](https://github.com/sourcegraph/cody/pull/3373)
 - Autocomplete: Do not cut off completions when they are almost identical to the following non-empty line. [pull/3377](https://github.com/sourcegraph/cody/pull/3377)
 
+## [1.8.3]
+
+### Fixed
+
+- Fix crash upon initialization in the stable build if a prerelease version of the VS Code extension was used for chat after 2024-03-08. [pull/3394](https://github.com/sourcegraph/cody/pull/3394)
+
 ## [1.8.2]
 
 ### Added

vscode/package.json

@@ -2,7 +2,7 @@
   "name": "cody-ai",
   "private": true,
   "displayName": "Cody AI",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "publisher": "sourcegraph",
   "license": "Apache-2.0",
   "icon": "resources/cody.png",

vscode/playwright.config.ts

@@ -1,12 +1,14 @@
 import { defineConfig } from '@playwright/test'
 
+const isWin = process.platform.startsWith('win')
+
 export default defineConfig({
     workers: 1,
-    // Give failing tests a second chance
-    retries: 2,
+    // Give failing tests more chances
+    retries: isWin ? 4 : 2,
     testDir: 'test/e2e',
-    timeout: 20000,
+    timeout: isWin ? 30000 : 20000,
     expect: {
-        timeout: 3000,
+        timeout: isWin ? 5000 : 3000,
     },
 })

vscode/src/completions/detect-multiline.ts

@@ -45,6 +45,7 @@ const LANGUAGES_WITH_MULTILINE_SUPPORT = [
     'java',
     'javascript',
     'javascriptreact',
+    'kotlin',
     'php',
     'python',
     'rust',

vscode/src/completions/get-inline-completions-tests/languages.test.ts

@@ -5,7 +5,7 @@ import type { CompletionParameters } from '@sourcegraph/cody-shared'
 
 import { completion } from '../test-helpers'
 
-import { getInlineCompletionsInsertText, params } from './helpers'
+import { getInlineCompletionsInsertText, getInlineCompletionsWithInlinedChunks, params } from './helpers'
 
 describe('[getInlineCompletions] languages', () => {
     it('works with python', async () => {
@@ -304,4 +304,41 @@ describe('[getInlineCompletions] languages', () => {
                   }"
             `)
     })
+
+    it('works with kotlin', async () => {
+        const requests: CompletionParameters[] = []
+        const result = await getInlineCompletionsWithInlinedChunks(
+            `fun main() {
+                for (i in 0..10) {
+                    if (i % 2 == 0) {
+                        █println(i)
+                    } else if (i % 3 == 0) {
+                        println("Multiple of 3: $i")
+                    } else {
+                        println("ODD $i")
+                    }
+                }
+
+                for (i in 0..11) {
+                    println("unrelated")
+                }
+            }█`,
+            {
+                languageId: 'kotlin',
+                onNetworkRequest(params) {
+                    requests.push(params)
+                },
+            }
+        )
+
+        expect(requests).toBeMultiLine()
+        expect(result.items[0].insertText).toMatchInlineSnapshot(`
+          "println(i)
+                  } else if (i % 3 == 0) {
+                      println("Multiple of 3: $i")
+                  } else {
+                      println("ODD $i")
+                  }"
+        `)
+    })
 })

vscode/src/editor/utils/document-sections.ts

@@ -1,8 +1,5 @@
 import * as vscode from 'vscode'
 import { IndentationBasedFoldingRangeProvider } from '../../lsp/foldingRanges'
-const isIndentationBasedFoldingRanges =
-    vscode.workspace.getConfiguration().get<string>('cody.experimental.foldingRanges', 'lsp') ===
-    'indentation-based'
 
 export async function getDocumentSections(
     doc: vscode.TextDocument,
@@ -247,7 +244,10 @@ async function defaultGetFoldingRanges(uri: vscode.Uri): Promise<vscode.FoldingR
     // setting `"cody.experimental.foldingRanges": "indentation-based"` and
     // reload VS Code. Beyond feature parity between all clients, this implementation
     // can be used to write test cases without mocking, which is a nice benefit.
-    if (isIndentationBasedFoldingRanges) {
+    if (
+        vscode.workspace.getConfiguration().get<string>('cody.experimental.foldingRanges', 'lsp') ===
+        'indentation-based'
+    ) {
         const provider = new IndentationBasedFoldingRangeProvider()
         const document = await vscode.workspace.openTextDocument(uri)
         return provider.provideFoldingRanges(document, {}, new vscode.CancellationTokenSource().token)

vscode/src/tree-sitter/language.ts

@@ -16,6 +16,7 @@ export function getLanguageConfig(languageId: string): LanguageConfig | null {
         case 'java':
         case 'javascript':
         case 'javascriptreact':
+        case 'kotlin':
         case 'php':
         case 'rust':
         case 'svelte':

vscode/webviews/vite.config.ts

@@ -14,7 +14,7 @@ export default defineProjectWithDefaults(__dirname, {
         target: 'esnext',
         assetsDir: '.',
         minify: false,
-        sourcemap: true,
+        sourcemap: false,
         reportCompressedSize: false,
         rollupOptions: {
             watch: {