feat(lsp): report diagnostics and keep up with changes

Author: mjossdev

cli/src/main/kotlin/tools/samt/cli/CliCompiler.kt

@@ -16,7 +16,7 @@ internal fun compile(command: CompileCommand, controller: DiagnosticController)
     // attempt to parse each source file into an AST
     val fileNodes = buildList {
         for (source in sourceFiles) {
-            val context = controller.createContext(source)
+            val context = controller.getOrCreateContext(source)
             val tokenStream = Lexer.scan(source.content.reader(), context)
 
             if (context.hasErrors()) {

cli/src/main/kotlin/tools/samt/cli/CliDumper.kt

@@ -19,7 +19,7 @@ internal fun dump(command: DumpCommand, terminal: Terminal, controller: Diagnost
     // attempt to parse each source file into an AST
     val fileNodes = buildList {
         for (source in sourceFiles) {
-            val context = controller.createContext(source)
+            val context = controller.getOrCreateContext(source)
 
             if (dumpAll || command.dumpTokens) {
                 // create duplicate scan because sequence can only be iterated once

cli/src/main/kotlin/tools/samt/cli/CliFileResolution.kt

@@ -2,34 +2,11 @@ package tools.samt.cli
 
 import tools.samt.common.DiagnosticController
 import tools.samt.common.SourceFile
+import tools.samt.common.collectSamtFiles
+import tools.samt.common.readSamtSource
 import java.io.File
 
-internal fun List<String>.readSamtSourceFiles(controller: DiagnosticController): List<SourceFile> {
-    val files = map { File(it) }.ifEmpty { gatherSamtFiles(controller.workingDirectoryAbsolutePath) }
+internal fun List<String>.readSamtSourceFiles(controller: DiagnosticController): List<SourceFile> =
+    map { File(it) }.ifEmpty { collectSamtFiles(controller.workingDirectoryAbsolutePath) }
+        .readSamtSource(controller)
 
-    return buildList {
-        for (file in files) {
-            if (!file.exists()) {
-                controller.reportGlobalError("File '${file.canonicalPath}' does not exist")
-                continue
-            }
-
-            if (!file.canRead()) {
-                controller.reportGlobalError("File '${file.canonicalPath}' cannot be read, bad file permissions?")
-                continue
-            }
-
-            if (file.extension != "samt") {
-                controller.reportGlobalError("File '${file.canonicalPath}' must end in .samt")
-                continue
-            }
-
-            add(SourceFile(file.canonicalPath, content = file.readText()))
-        }
-    }
-}
-
-internal fun gatherSamtFiles(directory: String): List<File> {
-    val dir = File(directory)
-    return dir.walkTopDown().filter { it.isFile && it.extension == "samt" }.toList()
-}

cli/src/test/kotlin/tools/samt/cli/ASTPrinterTest.kt

@@ -84,7 +84,7 @@ class ASTPrinterTest {
         val filePath = "/tmp/ASTPrinterTest.samt"
         val sourceFile = SourceFile(filePath, source)
         val diagnosticController = DiagnosticController("/tmp")
-        val diagnosticContext = diagnosticController.createContext(sourceFile)
+        val diagnosticContext = diagnosticController.getOrCreateContext(sourceFile)
         val stream = Lexer.scan(source.reader(), diagnosticContext)
         val fileTree = Parser.parse(sourceFile, stream, diagnosticContext)
         assertFalse(diagnosticContext.hasErrors(), "Expected no errors, but had errors")

cli/src/test/kotlin/tools/samt/cli/DiagnosticFormatterTest.kt

@@ -45,7 +45,7 @@ class DiagnosticFormatterTest {
         val controller = DiagnosticController(baseDirectory)
         val source = ""
         val sourceFile = SourceFile(filePath, source)
-        val context = controller.createContext(sourceFile)
+        val context = controller.getOrCreateContext(sourceFile)
 
         context.error {
             message("some error")
@@ -484,7 +484,7 @@ class DiagnosticFormatterTest {
         val filePath = Path("/tmp", "DiagnosticFormatterTest.samt").absolutePathString()
         val sourceFile = SourceFile(filePath, source)
         val diagnosticController = DiagnosticController(baseDirectory)
-        val diagnosticContext = diagnosticController.createContext(sourceFile)
+        val diagnosticContext = diagnosticController.getOrCreateContext(sourceFile)
         val stream = Lexer.scan(source.reader(), diagnosticContext)
         val fileTree = Parser.parse(sourceFile, stream, diagnosticContext)
         assertFalse(diagnosticContext.hasErrors(), "Expected no errors, but had errors")

cli/src/test/kotlin/tools/samt/cli/TokenPrinterTest.kt

@@ -49,7 +49,7 @@ class TokenPrinterTest {
         val filePath = "/tmp/TokenPrinterTest.samt"
         val sourceFile = SourceFile(filePath, source)
         val diagnosticController = DiagnosticController("/tmp")
-        val diagnosticContext = diagnosticController.createContext(sourceFile)
+        val diagnosticContext = diagnosticController.getOrCreateContext(sourceFile)
         val stream = Lexer.scan(source.reader(), diagnosticContext)
         assertFalse(diagnosticContext.hasErrors(), "Expected no errors, but had errors")
         return stream

common/src/main/kotlin/tools/samt/common/Diagnostics.kt

@@ -56,7 +56,7 @@ class DiagnosticController(val workingDirectoryAbsolutePath: String) {
     /**
      * Creates a new diagnostic context for the given source file or returns already existing one.
      * */
-    fun createContext(source: SourceFile): DiagnosticContext {
+    fun getOrCreateContext(source: SourceFile): DiagnosticContext {
         val foundContext = contexts.find { it.source == source}
         if (foundContext != null) return foundContext
         return DiagnosticContext(source).also { contexts.add(it) }

common/src/main/kotlin/tools/samt/common/Files.kt

@@ -0,0 +1,31 @@
+package tools.samt.common
+
+import java.io.File
+
+fun List<File>.readSamtSource(controller: DiagnosticController): List<SourceFile> {
+    return buildList {
+        for (file in this@readSamtSource) {
+            if (!file.exists()) {
+                controller.reportGlobalError("File '${file.canonicalPath}' does not exist")
+                continue
+            }
+
+            if (!file.canRead()) {
+                controller.reportGlobalError("File '${file.canonicalPath}' cannot be read, bad file permissions?")
+                continue
+            }
+
+            if (file.extension != "samt") {
+                controller.reportGlobalError("File '${file.canonicalPath}' must end in .samt")
+                continue
+            }
+
+            add(SourceFile(file.canonicalPath, content = file.readText()))
+        }
+    }
+}
+
+fun collectSamtFiles(directory: String): List<File> {
+    val dir = File(directory)
+    return dir.walkTopDown().filter { it.isFile && it.extension == "samt" }.toList()
+}

common/src/test/kotlin/tools/samt/common/DiagnosticsTest.kt

@@ -36,7 +36,7 @@ class DiagnosticsTest {
             package debug
         """.trimIndent()
         val sourceFile = SourceFile(sourcePath, sourceCode)
-        val context = controller.createContext(sourceFile)
+        val context = controller.getOrCreateContext(sourceFile)
 
         assertThrows<DiagnosticException>("some fatal error") {
             context.fatal {
@@ -65,7 +65,7 @@ class DiagnosticsTest {
             package debug
         """.trimIndent().trim()
         val sourceFile = SourceFile(sourcePath, sourceCode)
-        val context = controller.createContext(sourceFile)
+        val context = controller.getOrCreateContext(sourceFile)
 
         val importStatementStartOffset = FileOffset(0, 0, 0)
         val importStatementEndOffset = FileOffset(17, 0, 17)

language-server/src/main/kotlin/tools/samt/ls/FileInfo.kt

@@ -0,0 +1,35 @@
+package tools.samt.ls
+
+import tools.samt.common.DiagnosticContext
+import tools.samt.common.DiagnosticException
+import tools.samt.common.SourceFile
+import tools.samt.lexer.Lexer
+import tools.samt.lexer.Token
+import tools.samt.parser.FileNode
+import tools.samt.parser.Parser
+
+class FileInfo(
+    val diagnosticContext: DiagnosticContext,
+    val sourceFile: SourceFile,
+    val tokens: List<Token>,
+    val fileNode: FileNode? = null
+)
+
+fun parseFile(sourceFile: SourceFile): FileInfo {
+    val diagnosticContext = DiagnosticContext(sourceFile)
+
+    val tokens = Lexer.scan(sourceFile.content.reader(), diagnosticContext).toList()
+
+    if (diagnosticContext.hasErrors()) {
+        return FileInfo(diagnosticContext, sourceFile, tokens)
+    }
+
+    val fileNode = try {
+        Parser.parse(sourceFile, tokens.asSequence(), diagnosticContext)
+    } catch (e: DiagnosticException) {
+        // error message is added to the diagnostic console, so it can be ignored here
+        return FileInfo(diagnosticContext, sourceFile, tokens)
+    }
+
+    return FileInfo(diagnosticContext, sourceFile, tokens, fileNode)
+}