Store source language in SourceFile

Author: fwcd

server/src/main/kotlin/org/javacs/kt/SourceFiles.kt

@@ -22,7 +22,7 @@ import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.stream.Collectors
 
-private class SourceVersion(val content: String, val version: Int, val isTemporary: Boolean)
+private class SourceVersion(val content: String, val version: Int, val language: Language?, val isTemporary: Boolean)
 
 /**
  * Notify SourcePath whenever a file changes
@@ -36,7 +36,7 @@ private class NotifySourcePath(private val sp: SourcePath) {
         val content = convertLineSeparators(source.content)
 
         files[uri] = source
-        sp.put(uri, content, source.isTemporary)
+        sp.put(uri, content, source.language, source.isTemporary)
     }
 
     fun remove(uri: URI) {
@@ -74,7 +74,7 @@ class SourceFiles(
     private val open = mutableSetOf<URI>()
 
     fun open(uri: URI, content: String, version: Int) {
-        files[uri] = SourceVersion(content, version, isTemporary = !exclusions.isURIIncluded(uri))
+        files[uri] = SourceVersion(content, version, languageOf(uri), isTemporary = !exclusions.isURIIncluded(uri))
         open.add(uri)
     }
 
@@ -110,7 +110,7 @@ class SourceFiles(
                 else newText = patch(newText, change)
             }
 
-            files[uri] = SourceVersion(newText, newVersion, existing.isTemporary)
+            files[uri] = SourceVersion(newText, newVersion, existing.language, existing.isTemporary)
         }
     }
 
@@ -133,7 +133,7 @@ class SourceFiles(
 
     private fun readFromDisk(uri: URI, temporary: Boolean): SourceVersion? = try {
         val content = contentProvider.contentOf(uri)
-        SourceVersion(content, -1, isTemporary = temporary)
+        SourceVersion(content, -1, languageOf(uri), isTemporary = temporary)
     } catch (e: FileNotFoundException) {
         null
     } catch (e: IOException) {
@@ -144,19 +144,14 @@ class SourceFiles(
     private fun isSource(uri: URI): Boolean = exclusions.isURIIncluded(uri) && languageOf(uri) != null
 
     private fun languageOf(uri: URI): Language? {
-        val path = uri.path
+        val fileName = uri.filePath?.fileName?.toString() ?: return null
         return when {
-            path.endsWith(".kt") || path.endsWith(".kts") -> KotlinLanguage.INSTANCE
-            path.endsWith(".java") -> JavaLanguage.INSTANCE
+            fileName.endsWith(".kt") || fileName.endsWith(".kts") -> KotlinLanguage.INSTANCE
+            fileName.endsWith(".java") -> JavaLanguage.INSTANCE
             else -> null
         }
     }
 
-    private fun findSourceFiles(root: Path): Set<URI> = Files.walk(root)
-        .map(Path::toUri)
-        .filter(this::isSource)
-        .collect(Collectors.toSet())
-
     fun addWorkspaceRoot(root: Path) {
         val addSources = findSourceFiles(root)
 
@@ -221,6 +216,15 @@ private fun patch(sourceText: String, change: TextDocumentContentChangeEvent): S
     }
 }
 
+private fun findSourceFiles(root: Path): Set<URI> {
+    val sourceMatcher = FileSystems.getDefault().getPathMatcher("glob:*.{kt,kts,java}")
+    val exclusions = SourceExclusions(root)
+    return Files.walk(root)
+        .filter { exclusions.isPathIncluded(it) && sourceMatcher.matches(it.fileName) }
+        .map(Path::toUri)
+        .collect(Collectors.toSet())
+}
+
 private fun logAdded(sources: Collection<URI>, rootPath: Path?) {
     LOG.info("Adding {} under {} to source path", describeURIs(sources), rootPath)
 }

server/src/main/kotlin/org/javacs/kt/SourcePath.kt

@@ -2,6 +2,7 @@ package org.javacs.kt
 
 import org.javacs.kt.util.filePath
 import org.javacs.kt.util.describeURI
+import org.jetbrains.kotlin.com.intellij.lang.Language
 import org.jetbrains.kotlin.container.ComponentProvider
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.BindingContext
@@ -29,6 +30,7 @@ class SourcePath(
         var compiledFile: KtFile? = null,
         var compiledContext: BindingContext? = null,
         var compiledContainer: ComponentProvider? = null,
+        val language: Language? = null,
         val isTemporary: Boolean = false // A temporary source file will not be returned by .all()
     ) {
         val isScript: Boolean = uri.toString().endsWith(".kts")
@@ -42,7 +44,7 @@ class SourcePath(
 
         fun parseIfChanged(): SourceFile {
             if (content != parsed?.text) {
-                parsed = cp.compiler.createFile(content, path ?: Paths.get("sourceFile.virtual.kt"), kind)
+                parsed = cp.compiler.createFile(content, path ?: Paths.get("sourceFile.virtual.${language?.associatedFileType?.defaultExtension ?: "kt"}"), kind)
             }
 
             return this
@@ -92,12 +94,12 @@ class SourcePath(
             // Fallback solution, usually *all* source files
             // should be added/opened through SourceFiles
             LOG.warn("Requested source file {} is not on source path, this is most likely a bug. Adding it now temporarily...", describeURI(uri))
-            put(uri, contentProvider.contentOf(uri), temporary = true)
+            put(uri, contentProvider.contentOf(uri), null, temporary = true)
         }
         return files[uri]!!
     }
 
-    fun put(uri: URI, content: String, temporary: Boolean = false) {
+    fun put(uri: URI, content: String, language: Language?, temporary: Boolean = false) {
         assert(!content.contains('\r'))
 
         if (temporary) {
@@ -107,7 +109,7 @@ class SourcePath(
         if (uri in files) {
             sourceFile(uri).put(content)
         } else {
-            files[uri] = SourceFile(uri, content, isTemporary = temporary)
+            files[uri] = SourceFile(uri, content, language = language, isTemporary = temporary)
         }
     }