DEV2-3340 include text in workspace context

Common/src/main/java/com/tabnineCommon/chat/commandHandlers/context/BasicContextCache.kt

@@ -0,0 +1,11 @@
+package com.tabnineCommon.chat.commandHandlers.context
+
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.util.Key
+
+object BasicContextCache {
+    private val basicContextKey = Key.create<BasicContext>("com.tabnine.BasicContextCacheKey")
+    fun save(editor: Editor, entry: BasicContext) = editor.putUserData(basicContextKey, entry)
+
+    fun get(editor: Editor) = editor.getUserData(basicContextKey)
+}

Common/src/main/java/com/tabnineCommon/chat/commandHandlers/context/GetBasicContextHandler.kt

@@ -11,9 +11,9 @@ import com.tabnineCommon.general.DependencyContainer
 import java.io.File
 
 data class BasicContext(
-    private val fileUri: String? = null,
-    private val language: String? = null,
-    private var metadata: JsonObject? = null
+    val fileUri: String? = null,
+    val language: String? = null,
+    var metadata: JsonObject? = null
 ) {
     constructor(metadata: JsonObject?) : this() {
         this.metadata = metadata
@@ -23,20 +23,23 @@ data class BasicContext(
 class GetBasicContextHandler(gson: Gson) : ChatMessageHandler<Unit, BasicContext>(gson) {
     private val binaryRequestFacade = DependencyContainer.instanceOfBinaryRequestFacade()
 
-    override fun handle(payload: Unit?, project: Project): BasicContext? {
+    override fun handle(payload: Unit?, project: Project): BasicContext {
         val editor = getEditorFromProject(project) ?: return noEditorResponse(project)
 
         val psiFile = PsiDocumentManager.getInstance(project).getPsiFile(editor.document)
         val fileUri = psiFile?.virtualFile?.path
-        val language = psiFile?.language?.id
-
-        var metadata = if (fileUri != null) binaryRequestFacade.executeRequest(FileMetadataRequest(fileUri)) else null
-
+        var metadata = fileUri?.let {
+            binaryRequestFacade.executeRequest(FileMetadataRequest(it))
+        }
         if (metadata?.has("error") == true) {
             metadata = null
         }
+        val language = metadata?.get("language")?.asString ?: psiFile?.language?.id
+
+        val basicContext = BasicContext(fileUri, language, metadata)
+        BasicContextCache.save(editor, basicContext)
 
-        return BasicContext(fileUri, language, metadata)
+        return basicContext
     }
 
     override fun deserializeRequest(data: JsonElement?) {}

Common/src/main/java/com/tabnineCommon/chat/commandHandlers/context/workspace/FindSymbolsCommandExecutor.kt

@@ -1,7 +1,9 @@
 package com.tabnineCommon.chat.commandHandlers.context.workspace
 
+import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
+import com.tabnineCommon.chat.commandHandlers.context.BasicContextCache
 import com.tabnineCommon.chat.commandHandlers.utils.StringCaseConverter
 import com.tabnineCommon.chat.commandHandlers.utils.SymbolsResolver
 import com.tabnineCommon.chat.commandHandlers.utils.submitReadAction
@@ -11,6 +13,12 @@ private const val MAX_RESULTS_PER_SYMBOL = 5
 
 class FindSymbolsCommandExecutor : CommandsExecutor {
     override fun execute(arg: String, editor: Editor, project: Project): List<String> {
+        val basicContext = BasicContextCache.get(editor)
+        if (basicContext == null || basicContext.language.isNullOrBlank()) {
+            Logger.getInstance(javaClass).warn("Could not obtain basic context, skipping findSymbols command execution")
+            return emptyList()
+        }
+
         val camelCaseArg = StringCaseConverter.toCamelCase(arg)
         val snakeCaseArg = StringCaseConverter.toSnakeCase(arg)
 
@@ -31,8 +39,9 @@ class FindSymbolsCommandExecutor : CommandsExecutor {
 
         CompletableFuture.allOf(*tasks.toTypedArray()).get()
 
-        return tasks.map { it.get() }.flatten()
-            .map { "${it.name} - ${it.relativePath}" }
-            .toList()
+        return tasks.asSequence().map { it.get() }.flatten()
+            .filter { !it.text.isNullOrBlank() }
+            .take(2)
+            .map { "file: ${it.relativePath}\n```${basicContext.language.toLowerCase()}\n${it.text}\n```" }.toList()
     }
 }

Common/src/main/java/com/tabnineCommon/chat/commandHandlers/context/workspace/WorkspaceContext.kt

@@ -41,7 +41,9 @@ data class WorkspaceContext(
 
                 tasks.mapNotNull { it.get() }.forEach { executionResult ->
                     when (executionResult.command) {
-                        Command.FindSymbols -> symbols.addAll(executionResult.result)
+                        // we reverse the list to get the most relevant symbols at the bottom - closer
+                        // to the end of the prompt eventually.
+                        Command.FindSymbols -> symbols.addAll(executionResult.result.reversed())
                     }
                 }
 

Tabnine/src/test/java/com/tabnine/unitTests/GsonSerDeTests.kt

@@ -22,6 +22,13 @@ class GsonDeserializeTests {
         assert(testGson.test == "test" && testGson.number == 1)
     }
 
+    @Test
+    fun shouldIgnoreExtraFields() {
+        val json = "{\"test\":\"test\",\"number\":1,\"extra\":\"extra\"}"
+        val testGson = ourSingletonGson.fromJson(json, Simple::class.java)
+        assert(testGson.test == "test" && testGson.number == 1)
+    }
+
     @Test
     fun shouldDeserializeDoubleCorrectly() {
         val json = "{\"double\":1.1}"