Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial LSP Server (Linting, Parsing, Typecheck) #8

Closed
wants to merge 18 commits into from
Closed

Initial LSP Server (Linting, Parsing, Typecheck) #8

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2d21d6b
wip new parser structures
jmcardon Mar 1, 2023
8342436
desugar compiling
jmcardon Mar 2, 2023
bc76a1a
bindings, objects
jmcardon Mar 8, 2023
6e0812f
fix type parsing
jmcardon Mar 10, 2023
06c67d4
Mostly fix parser
jmcardon Mar 11, 2023
91c30e9
fix parser and tests
rsoeldner Mar 16, 2023
c81f37f
fix desugar to emit errors
jmcardon Mar 17, 2023
cf0991b
remove TokenTy*
rsoeldner Mar 17, 2023
ed78b02
use span information
rsoeldner Mar 20, 2023
854422d
fix combineSpan
rsoeldner Mar 20, 2023
b6a4266
wip
rsoeldner Mar 20, 2023
e37963d
Address review comments, fix `object` pretty instance
rsoeldner Mar 22, 2023
cbbe1c9
Merge pull request #7 from kadena-io/rsoeldner/fix-parser
jmcardon Mar 23, 2023
a976836
wip
rsoeldner Mar 27, 2023
6bbc873
add lexer and parser diagnostic
rsoeldner Mar 27, 2023
f34cff5
wip compile pipe
rsoeldner Mar 28, 2023
c673200
wip
rsoeldner Mar 29, 2023
ad2f34c
add completion context
rsoeldner Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address review comments, fix object pretty instance
  • Loading branch information
@rsoeldner
rsoeldner committed Mar 22, 2023
commit e37963d7de996ab0d2308bede941f13c017a4711
30 changes: 22 additions & 8 deletions pact-core-tests/Pact/Core/Test/LexerParserTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import qualified Pact.Core.Syntax.Lisp.Parser as Lisp
import Pact.Core.Syntax.Lisp.LexUtils (Token(..))
import Pact.Core.Literal


showPretty :: Pretty a => a -> BS.ByteString
showPretty = BS.pack . show . pretty

Expand Down Expand Up @@ -115,15 +114,23 @@ parsedExprToSrc :: Lisp.Expr () -> BS.ByteString
parsedExprToSrc = BS.pack . show . pretty

varGen :: ParserGen
varGen = Gen.choice [bn, qn]
varGen = (`Lisp.Var` ()) <$> parsedNameGen

parsedNameGen :: Gen ParsedName
parsedNameGen = Gen.choice [qn, bn]
where
bn = (\n -> Lisp.Var (BN $ BareName n) ()) <$> identGen
bn = BN . BareName <$> identGen
qn = do
modName <- identGen
name <- identGen
modNs <- Gen.maybe (NamespaceName <$> identGen)
let qname = QualifiedName name (ModuleName modName modNs)
pure $ Lisp.Var (QN qname) ()
mn <- moduleNameGen
let qname = QualifiedName name mn
pure (QN qname)

moduleNameGen :: Gen ModuleName
moduleNameGen = do
modName <- identGen
modNS <- Gen.maybe (NamespaceName <$> identGen)
pure (ModuleName modName modNS)

constantGen :: ParserGen
constantGen = (`Lisp.Constant` ()) <$> Gen.choice
Expand Down Expand Up @@ -178,7 +185,14 @@ exprGen = Gen.recursive Gen.choice
typeGen :: Gen Lisp.Type
typeGen = Gen.recursive Gen.choice
(Gen.constant . Lisp.TyPrim <$> [minBound ..])
[Lisp.TyList <$> typeGen]
[Lisp.TyList <$> typeGen
,pure Lisp.TyPolyList
,Lisp.TyModRef <$> moduleNameGen
,pure Lisp.TyGuard
,pure Lisp.TyKeyset
,Lisp.TyObject <$> parsedNameGen
,pure Lisp.TyTime
,pure Lisp.TyPolyObject]

binderGen = do
name <- identGen
Expand Down
3 changes: 0 additions & 3 deletions pact-core-tests/PactCoreTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,12 @@ import Test.Tasty
import qualified Pact.Core.Test.ReplTests as ReplTests
import qualified Pact.Core.Test.LexerParserTests as LexerParserTests
import qualified Pact.Core.Test.LexerTests as LexerTests
import qualified Pact.Core.Test.ParserTests as ParserTests


main :: IO ()
main = do
replTests <- ReplTests.tests
defaultMain $ testGroup "pactTests"
[ replTests
, LexerTests.tests
, ParserTests.tests
, LexerParserTests.tests
]
1 change: 0 additions & 1 deletion pact-core.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,3 @@ test-suite core-tests
, Pact.Core.Test.ReplTests
, Pact.Core.Test.LexerParserTests
, Pact.Core.Test.LexerTests
, Pact.Core.Test.ParserTests
2 changes: 1 addition & 1 deletion pact-core/Pact/Core/Syntax/Lisp/ParseTree.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ instance Pretty Type where
TyPolyList -> "list"
TyGuard -> "guard"
TyKeyset -> "keyset"
TyObject qn -> "object" <> brackets (pretty qn)
TyObject qn -> "object" <> braces (pretty qn)
TyPolyObject -> "object"
TyTime -> "time"

Expand Down