Test ranged semantic tokens (WIP)

Author: fwcd

server/src/test/kotlin/org/javacs/kt/LanguageServerTestFixture.kt

@@ -71,6 +71,9 @@ abstract class LanguageServerTestFixture(relativeWorkspaceRoot: String) : Langua
     fun semanticTokensParams(relativePath: String): SemanticTokensParams =
         textDocumentPosition(relativePath, 0, 0).run { SemanticTokensParams(textDocument) }
 
+    fun semanticTokensRangeParams(relativePath: String, range: Range): SemanticTokensRangeParams =
+        textDocumentPosition(relativePath, 0, 0).run { SemanticTokensRangeParams(textDocument, range) }
+
     fun signatureHelpParams(relativePath: String, line: Int, column: Int): SignatureHelpParams =
         textDocumentPosition(relativePath, line, column).run { SignatureHelpParams(textDocument, position) }
 

server/src/test/kotlin/org/javacs/kt/SemanticTokensTest.kt

@@ -9,30 +9,45 @@ import org.javacs.kt.semantictokens.SemanticTokenType
 import org.javacs.kt.semantictokens.SemanticTokenModifier
 
 class SemanticTokensTest : SingleFileTestFixture("semantictokens", "SemanticTokens.kt") {
-    @Test fun `tokenize entire file`() {
-        val response = languageServer.textDocumentService.semanticTokensFull(semanticTokensParams(file)).get()!!
-        val actual = response.data
-        val expected = encodeTokens(sequenceOf(
-            SemanticToken(range(1, 5, 1, 13), SemanticTokenType.PROPERTY, setOf(SemanticTokenModifier.DECLARATION)), // variable
+    @Test fun `tokenize file`() {
+        val varLine = 1
+        val constLine = 2
+        val classLine = 4
+        val funLine = 6
 
-            SemanticToken(range(2, 5, 2, 13), SemanticTokenType.PROPERTY, setOf(SemanticTokenModifier.DECLARATION, SemanticTokenModifier.READONLY)), // constant
-            SemanticToken(range(2, 15, 2, 21), SemanticTokenType.CLASS), // String
-            SemanticToken(range(2, 24, 2, 40), SemanticTokenType.STRING), // "test $variable"
-            SemanticToken(range(2, 30, 2, 39), SemanticTokenType.INTERPOLATION_ENTRY), // $variable
-            SemanticToken(range(2, 31, 2, 39), SemanticTokenType.PROPERTY), // variable
-
-            SemanticToken(range(4, 12, 4, 16), SemanticTokenType.CLASS, setOf(SemanticTokenModifier.DECLARATION)), // Type
-            SemanticToken(range(4, 21, 4, 29), SemanticTokenType.PARAMETER, setOf(SemanticTokenModifier.DECLARATION, SemanticTokenModifier.READONLY)), // property
-            SemanticToken(range(4, 31, 4, 34), SemanticTokenType.CLASS), // Int
-
-            SemanticToken(range(6, 5, 6, 6), SemanticTokenType.FUNCTION, setOf(SemanticTokenModifier.DECLARATION)), // f
-            SemanticToken(range(6, 7, 6, 8), SemanticTokenType.PARAMETER, setOf(SemanticTokenModifier.DECLARATION, SemanticTokenModifier.READONLY)), // x
-            SemanticToken(range(6, 10, 6, 13), SemanticTokenType.CLASS), // Int?
-            SemanticToken(range(6, 24, 6, 27), SemanticTokenType.CLASS), // Int
-            SemanticToken(range(6, 30, 6, 31), SemanticTokenType.FUNCTION), // f
-            SemanticToken(range(6, 32, 6, 33), SemanticTokenType.VARIABLE, setOf(SemanticTokenModifier.READONLY)), // x
+        val expectedVar = encodeTokens(sequenceOf(
+            SemanticToken(range(varLine, 5, varLine, 13), SemanticTokenType.PROPERTY, setOf(SemanticTokenModifier.DECLARATION)), // variable
+        ))
+        val expectedConst = encodeTokens(sequenceOf(
+            SemanticToken(range(constLine, 5, constLine, 13), SemanticTokenType.PROPERTY, setOf(SemanticTokenModifier.DECLARATION, SemanticTokenModifier.READONLY)), // constant
+            SemanticToken(range(constLine, 15, constLine, 21), SemanticTokenType.CLASS), // String
+            SemanticToken(range(constLine, 24, constLine, 40), SemanticTokenType.STRING), // "test $variable"
+            SemanticToken(range(constLine, 30, constLine, 39), SemanticTokenType.INTERPOLATION_ENTRY), // $variable
+            SemanticToken(range(constLine, 31, constLine, 39), SemanticTokenType.PROPERTY), // variable
         ))
+        val expectedClass = encodeTokens(sequenceOf(
+            SemanticToken(range(classLine, 12, classLine, 16), SemanticTokenType.CLASS, setOf(SemanticTokenModifier.DECLARATION)), // Type
+            SemanticToken(range(classLine, 21, classLine, 29), SemanticTokenType.PARAMETER, setOf(SemanticTokenModifier.DECLARATION, SemanticTokenModifier.READONLY)), // property
+            SemanticToken(range(classLine, 31, classLine, 34), SemanticTokenType.CLASS), // Int
+        ))
+        val expectedFun = encodeTokens(sequenceOf(
+            SemanticToken(range(funLine, 5, funLine, 6), SemanticTokenType.FUNCTION, setOf(SemanticTokenModifier.DECLARATION)), // f
+            SemanticToken(range(funLine, 7, funLine, 8), SemanticTokenType.PARAMETER, setOf(SemanticTokenModifier.DECLARATION, SemanticTokenModifier.READONLY)), // x
+            SemanticToken(range(funLine, 10, funLine, 13), SemanticTokenType.CLASS), // Int?
+            SemanticToken(range(funLine, 24, funLine, 27), SemanticTokenType.CLASS), // Int
+            SemanticToken(range(funLine, 30, funLine, 31), SemanticTokenType.FUNCTION), // f
+            SemanticToken(range(funLine, 32, funLine, 33), SemanticTokenType.VARIABLE, setOf(SemanticTokenModifier.READONLY)), // x
+        ))
+
+        val partialExpected = expectedConst + expectedClass
+        val partialResponse = languageServer.textDocumentService.semanticTokensRange(semanticTokensRangeParams(file, range(constLine, 0, classLine + 1, 0))).get()!!
+        // DEBUG
+        println(partialExpected)
+        println(partialResponse.data)
+        assertThat(partialResponse.data, contains(*partialExpected.toTypedArray()))
 
-        assertThat(actual, contains(*expected.toTypedArray()))
+        val fullExpected = expectedVar + expectedConst + expectedClass + expectedFun
+        val fullResponse = languageServer.textDocumentService.semanticTokensFull(semanticTokensParams(file)).get()!!
+        assertThat(fullResponse.data, contains(*fullExpected.toTypedArray()))
     }
 }