Merge branch 'main' into bee/update-webview-config

sourcegraph · Aug 19, 2024 · bdee018 · bdee018
2 parents 5f6565e + 7656452
commit bdee018
Show file tree

Hide file tree

Showing 69 changed files with 268 additions and 5,053 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -24,4 +24,4 @@ kotlin.stdlib.default.dependency=false
 nodeBinaries.commit=8755ae4c05fd476cd23f2972049111ba436c86d4
 nodeBinaries.version=v20.12.2
 cody.autocomplete.enableFormatting=true
-cody.commit=a7ba3c987888439299edb6c215bb8b3ed4765d1d
+cody.commit=ec9d08e976153166c448a3df696488d882c4581e
diff --git a/src/integrationTest/kotlin/com/sourcegraph/cody/edit/DocumentCodeTest.kt b/src/integrationTest/kotlin/com/sourcegraph/cody/edit/DocumentCodeTest.kt
@@ -12,13 +12,15 @@ import com.sourcegraph.cody.edit.widget.LensSpinner
 import com.sourcegraph.cody.edit.widget.LensWidgetGroup
 import com.sourcegraph.cody.util.CodyIntegrationTextFixture
 import com.sourcegraph.cody.util.CustomJunitClassRunner
+import kotlin.test.Ignore
 import org.hamcrest.Matchers.startsWith
 import org.junit.Assert.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(CustomJunitClassRunner::class)
 class DocumentCodeTest : CodyIntegrationTextFixture() {
+  @Ignore
   @Test
   fun testGetsWorkingGroupLens() {
     val codeLensGroup = runAndWaitForLenses(DocumentCodeAction.ID, EditCancelAction.ID)

diff --git a/src/main/java/com/sourcegraph/cody/PromptPanel.kt b/src/main/java/com/sourcegraph/cody/PromptPanel.kt