Rename HasComments to Comment; remove *.cabal

.gitignore

@@ -33,3 +33,4 @@ nix/result
 .idea
 *.iml
 stale_outputs_checked
+*.cabal

tools/lsp/squirrel/squirrel.cabal

@@ -1,74 +0,0 @@
-cabal-version: 1.12
-
--- This file has been generated from package.yaml by hpack version 0.33.0.
---
--- see: https://github.com/sol/hpack
---
--- hash: 0561ca5eedeec178effcd82246fe314b488637ceea34ea241eb4943714bdb7aa
-
-name:           squirrel
-version:        0.0.0
-build-type:     Simple
-
-library
-  exposed-modules:
-      AST
-      AST.Parser
-      AST.Scope
-      AST.Types
-      Error
-      HasComments
-      Lattice
-      Parser
-      ParseTree
-      Pretty
-      Range
-      Tree
-      Union
-  other-modules:
-      Paths_squirrel
-  hs-source-dirs:
-      src/
-  default-extensions: BangPatterns BlockArguments DataKinds DeriveFoldable DeriveFunctor DeriveTraversable DerivingStrategies DerivingVia FlexibleContexts FlexibleInstances GADTs GeneralisedNewtypeDeriving LambdaCase MultiParamTypeClasses NamedFieldPuns OverloadedStrings QuasiQuotes ScopedTypeVariables StandaloneDeriving TemplateHaskell TypeFamilies TypeOperators UndecidableInstances FunctionalDependencies ViewPatterns
-  ghc-options: -freverse-errors -Wall -threaded
-  include-dirs:
-      vendor
-  c-sources:
-      vendor/parser.c
-  build-depends:
-      base
-    , bytestring
-    , data-default
-    , data-fix
-    , mtl
-    , pretty
-    , template-haskell
-    , text
-    , tree-sitter
-  default-language: Haskell2010
-
-executable squirrel
-  main-is: Main.hs
-  other-modules:
-      Paths_squirrel
-  hs-source-dirs:
-      app/
-  default-extensions: BangPatterns BlockArguments DataKinds DeriveFoldable DeriveFunctor DeriveTraversable DerivingStrategies DerivingVia FlexibleContexts FlexibleInstances GADTs GeneralisedNewtypeDeriving LambdaCase MultiParamTypeClasses NamedFieldPuns OverloadedStrings QuasiQuotes ScopedTypeVariables StandaloneDeriving TemplateHaskell TypeFamilies TypeOperators UndecidableInstances FunctionalDependencies ViewPatterns
-  ghc-options: -freverse-errors -Wall -threaded
-  build-depends:
-      base
-    , bytestring
-    , data-default
-    , data-fix
-    , haskell-lsp
-    , hslogger
-    , interpolate
-    , lens
-    , mtl
-    , pretty
-    , squirrel
-    , stm
-    , template-haskell
-    , text
-    , tree-sitter
-  default-language: Haskell2010

tools/lsp/squirrel/src/AST/Parser.hs

@@ -46,8 +46,8 @@ declaration
   =   do ranged do pure ValueDecl <*> binding
   <|> do ranged do pure ValueDecl <*> vardecl
   <|> do ranged do pure ValueDecl <*> constdecl
-  <|> do typedecl
   <|> do ranged do pure Action    <*> attributes
+  <|> do typedecl
   <|> do include
 
 include :: Parser (Pascal ASTInfo)

tools/lsp/squirrel/src/AST/Scope.hs

@@ -29,7 +29,7 @@ import Parser
 import Range
 import AST.Types
 import Tree
-import HasComments
+import Comment
 import Pretty
 
 -- | Scope-holding monad.

tools/lsp/squirrel/src/Comment.hs

@@ -2,7 +2,7 @@
 {- | Comments and utilities.
 -}
 
-module HasComments
+module Comment
   ( HasComments(..)
   , c
   )

tools/lsp/squirrel/src/Parser.hs

@@ -76,7 +76,7 @@ import qualified Data.Text as Text
 import ParseTree
 import Range
 import Pretty
-import HasComments
+import Comment
 import Error
 
 import Debug.Trace

tools/lsp/squirrel/src/Tree.hs

@@ -29,7 +29,7 @@ import Data.Foldable
 
 import Union
 import Lattice
-import HasComments
+import Comment
 import Pretty
 import Error