Add support for sources (#427)

kubukoz · May 19, 2024 · cb186f4 · cb186f4
1 parent 1766b59
commit cb186f4
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/modules/core/src/main/scala/playground/PlaygroundConfig.scala b/modules/core/src/main/scala/playground/PlaygroundConfig.scala
@@ -7,6 +7,7 @@ import com.github.plokhotnyuk.jsoniter_scala.macros.JsonCodecMaker
 
 final case class PlaygroundConfig(
   imports: List[String],
+  sources: List[String],
   dependencies: List[String],
   repositories: List[String],
   extensions: List[String],
@@ -18,6 +19,7 @@ object PlaygroundConfig {
 
   val empty: PlaygroundConfig = PlaygroundConfig(
     imports = Nil,
+    sources = Nil,
     dependencies = Nil,
     repositories = Nil,
     extensions = Nil,
@@ -29,12 +31,14 @@ object PlaygroundConfig {
       mavenDependencies: List[String] = Nil,
       mavenRepositories: List[String] = Nil,
       imports: List[String] = Nil,
+      sources: List[String] = Nil,
       maven: Option[MavenConfig] = None,
       smithyPlayground: Option[SmithyPlaygroundPluginConfig] = None,
     ) {
 
       def toPlaygroundConfig: PlaygroundConfig = PlaygroundConfig(
         imports = imports,
+        sources = sources,
         dependencies = mavenDependencies ++ maven.foldMap(_.dependencies),
         repositories = mavenRepositories ++ maven.foldMap(_.repositories).map(_.url),
         extensions = smithyPlayground.foldMap(_.extensions),
@@ -51,6 +55,7 @@ object PlaygroundConfig {
         mavenDependencies = c.dependencies,
         mavenRepositories = c.repositories,
         imports = c.imports,
+        sources = c.sources,
         smithyPlayground = c.extensions.toNel.map { e =>
           SmithyPlaygroundPluginConfig(extensions = e.toList)
         },

diff --git a/modules/lsp/src/main/scala/playground/lsp/BuildLoader.scala b/modules/lsp/src/main/scala/playground/lsp/BuildLoader.scala
@@ -95,7 +95,11 @@ object BuildLoader {
           .getOrElse(sys.error("impossible - no parent for " + loaded.configFilePath))
 
         // "raw" means these can be directories etc., just like in the config file.
-        val rawImportPaths = loaded.config.imports.map(workspaceBase.resolve).toSet
+        val rawImportPaths =
+          (
+            loaded.config.imports ++
+              loaded.config.sources
+          ).map(workspaceBase.resolve).toSet
 
         for {
           specs <- filterImports(rawImportPaths)

diff --git a/modules/lsp/src/main/scala/playground/lsp/ServerLoader.scala b/modules/lsp/src/main/scala/playground/lsp/ServerLoader.scala
@@ -34,13 +34,14 @@ object ServerLoader {
   )
 
   case class WorkspaceStats(
+    sourceCount: Int,
     importCount: Int,
     dependencyCount: Int,
     pluginCount: Int,
   ) {
 
     def render: String =
-      s"$importCount imports, $dependencyCount dependencies and $pluginCount plugins"
+      s"$sourceCount sources, $importCount imports, $dependencyCount dependencies and $pluginCount plugins"
 
   }
 
@@ -49,6 +50,7 @@ object ServerLoader {
     def fromBuildConfig(
       bc: PlaygroundConfig
     ): WorkspaceStats = WorkspaceStats(
+      sourceCount = bc.sources.size,
       importCount = bc.imports.size,
       dependencyCount = bc.dependencies.size,
       pluginCount = bc.extensions.size,

diff --git a/modules/lsp/src/test/resources/test-workspaces/default/smithy-build.json b/modules/lsp/src/test/resources/test-workspaces/default/smithy-build.json
@@ -1,5 +1,5 @@
 {
-  "imports": ["./weather.smithy", "./no-runner.smithy"],
+  "sources": ["./weather.smithy", "./no-runner.smithy"],
   "mavenDependencies": [
     "com.disneystreaming.alloy:alloy-core:0.3.8",
     "com.disneystreaming.smithy4s:smithy4s-protocol:0.18.19"

diff --git a/modules/lsp/src/test/scala/playground/lsp/LanguageServerIntegrationTestSharedServer.scala b/modules/lsp/src/test/scala/playground/lsp/LanguageServerIntegrationTestSharedServer.scala
@@ -42,7 +42,7 @@ object LanguageServerIntegrationTestSharedServer
         ),
       TestClient.MessageLog(
         MessageType.Info,
-        "Loaded Smithy Playground server with 2 imports, 2 dependencies and 0 plugins",
+        "Loaded Smithy Playground server with 2 sources, 0 imports, 2 dependencies and 0 plugins",
       ),
     )
 

diff --git a/smithy-build.json b/smithy-build.json
@@ -1,5 +1,5 @@
 {
-  "imports": ["modules/core/src/test/smithy"],
+  "sources": ["modules/core/src/test/smithy"],
   "mavenDependencies": [
     "com.disneystreaming.alloy:alloy-core:0.3.8",
     "com.disneystreaming.smithy4s:smithy4s-protocol:0.18.19",