fluencelabs/aqua
1
0
Fork 0
mirror of https://github.com/fluencelabs/aqua.git synced 2025-03-15 11:40:50 +00:00
Code Issues Projects Releases Wiki Activity

fix(language-server): Go-to definition for path in use expression [LNG-187] (#733)

Browse Source 
add tokens for `use` and `use-from` expressions to language server
This commit is contained in:
Dima 2023-06-06 23:40:26 +03:00 committed by GitHub
parent da0821d9d5
commit 21cb3937ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
language-server/language-server-api/src/main/scala/aqua/lsp/LspSemantics.scala
View File

@ -1,7 +1,7 @@
package aqua.lsp package aqua.lsp
import aqua.parser.Ast import aqua.parser.Ast
import aqua.parser.head.{ImportExpr, ImportFromExpr} import aqua.parser.head.{ImportExpr, ImportFromExpr, UseExpr, UseFromExpr}
import aqua.parser.lexer.{LiteralToken, Token} import aqua.parser.lexer.{LiteralToken, Token}
import aqua.semantics.rules.ReportError import aqua.semantics.rules.ReportError
import aqua.semantics.rules.locations.LocationsState import aqua.semantics.rules.locations.LocationsState
@ -24,6 +24,8 @@ class LspSemantics[S[_]] extends Semantics[S, LspContext[S]] {
header match { header match {
case ImportExpr(fn) => l :+ fn case ImportExpr(fn) => l :+ fn
case ImportFromExpr(_, fn) => l :+ fn case ImportFromExpr(_, fn) => l :+ fn
case UseExpr(fn, _) => l :+ fn
case UseFromExpr(_, fn, _) => l :+ fn
case _ => l case _ => l
} }
} }

9
parser/src/main/scala/aqua/parser/head/UseExpr.scala
View File

@ -10,8 +10,8 @@ import aqua.parser.lift.Span
import aqua.parser.lift.Span.{P0ToSpan, PToSpan} import aqua.parser.lift.Span.{P0ToSpan, PToSpan}
case class UseExpr[F[_]]( case class UseExpr[F[_]](
filename: LiteralToken[F], filename: LiteralToken[F],
asModule: Option[Ability[F]] asModule: Option[Ability[F]]
) extends FilenameExpr[F] { ) extends FilenameExpr[F] {
override def mapK[K[_]: Comonad](fk: F ~> K): UseExpr[K] = override def mapK[K[_]: Comonad](fk: F ~> K): UseExpr[K] =
@ -24,7 +24,8 @@ case class UseExpr[F[_]](
object UseExpr extends HeaderExpr.Leaf { object UseExpr extends HeaderExpr.Leaf {
override val p: Parser[HeaderExpr[Span.S]] = override val p: Parser[HeaderExpr[Span.S]] =
(`use` *> ` ` *> ValueToken.string ~ (` as ` *> Ability.ab).?).map { case (filename, asModule) => (`use` *> ` ` *> ValueToken.string ~ (` as ` *> Ability.ab).?).map {
UseExpr(filename, asModule) case (filename, asModule) =>
UseExpr(filename, asModule)
} }
} }