add test

scalameta · Aug 22, 2023 · a0f5b24 · a0f5b24
1 parent af19ebc
commit a0f5b24
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 5 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/metals/WorkspaceLspService.scala b/metals/src/main/scala/scala/meta/internal/metals/WorkspaceLspService.scala
@@ -321,15 +321,10 @@ class WorkspaceLspService(
     focusedDocument.foreach(recentlyFocusedFiles.add)
     val uri = params.getTextDocument.getUri
     val path = uri.toAbsolutePath
-    scribe.info(s"did open file: $path")
-    scribe.info(s"did open uri: $uri")
     focusedDocument = Some(path)
-    scribe.info(s"found service: ${getServiceForOpt(path).map(_.path)}")
     val service = getServiceForOpt(path)
       .orElse {
         if (path.isScalaFilename) {
-          scribe.info(s"or else is Scala file")
-          scribe.info(s"non Scala projects ${nonScalaProjects.map(_.path)}")
           getFolderForOpt(path, nonScalaProjects)
             .map(workspaceFolders.convertToScalaProject)
         } else None

diff --git a/tests/unit/src/test/scala/tests/WorkspaceFoldersSuite.scala b/tests/unit/src/test/scala/tests/WorkspaceFoldersSuite.scala
@@ -46,4 +46,48 @@ class WorkspaceFoldersSuite
       )
     } yield ()
   }
+
+  test("non-scala-project") {
+    cleanWorkspace()
+    val newScalaFile = "/a/src/main/scala/A.scala"
+    for {
+      _ <- initialize(
+        Map(
+          "testFolder" ->
+            s"""|/metals.json
+                |{"a":{"scalaVersion" : ${V.scala213}}}
+                |/a/src/main/scala/a/A.scala
+                |package a
+                |case class MyObjectA()
+                |""".stripMargin,
+          "notYetScalaProject" ->
+            s"""|/README.md
+                |Will be a Scala project.
+                |""".stripMargin,
+        ),
+        expectError = false,
+      )
+      _ = assert(server.fullServer.folderServices.length == 1)
+      _ = assert(server.fullServer.nonScalaProjects.length == 1)
+      _ = writeLayout(
+        s"""|$newScalaFile
+            |package a
+            |object O {
+            | val i: Int = "aaa"
+            |}
+            |""".stripMargin,
+        "notYetScalaProject",
+      )
+      _ <- server.didOpen(s"notYetScalaProject$newScalaFile")
+      _ = assert(server.fullServer.folderServices.length == 2)
+      _ = assertEquals(
+        server.client.pathDiagnostics(s"notYetScalaProject$newScalaFile"),
+        s"""|notYetScalaProject$newScalaFile:3:15: error: Found:    ("aaa" : String)
+            |Required: Int
+            | val i: Int = "aaa"
+            |              ^^^^^
+            |""".stripMargin,
+      )
+    } yield ()
+  }
 }