Merge branch 'master' into symbol-node-type

Author: maxbrunsfeld

.ghci.repl

@@ -25,3 +25,24 @@
 :seti -Wno-unsafe
 :seti -Wno-star-is-type
 :seti -Wno-missing-deriving-strategies
+
+-- Turn on some language extensions you use a lot
+:seti -XFlexibleContexts -XOverloadedStrings -XTypeApplications
+
+-- Break on errors
+:seti -fbreak-on-error
+
+-- Automatically show the code around breakpoints
+:set stop :list
+
+-- Use a cyan lambda as the prompt
+:set prompt "\ESC[1;36m\STXλ \ESC[m\STX"
+
+-- Better errors
+:set -ferror-spans -freverse-errors -fprint-expanded-synonyms
+
+-- Better typed holes
+:set -funclutter-valid-hole-fits -fabstract-refinement-hole-fits -frefinement-level-hole-fits=2
+
+-- This usually impairs understanding
+:seti -Wno-type-defaults

.github/workflows/haskell.yml

@@ -28,38 +28,35 @@ jobs:
         cabal-version: ${{ matrix.cabal }}
 
     - uses: actions/cache@v1
-      name: Cache ~/.cabal/packages
+      id: cache-cabal
+      name: Cache Cabal artifacts
       with:
-        path: ~/.cabal/packages
-        key: ${{ runner.os }}-${{ matrix.ghc }}-cabal-packages
+        path: dist-cache
+        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}-cabal-cache-${{ hashFiles('**/*.cabal') }}
+        restore-keys: |
+          ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}-cabal-cache-
+          ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}-
+          ${{ runner.os }}-${{ matrix.ghc }}-
+          ${{ runner.os }}-
 
-    - uses: actions/cache@v1
-      name: Cache ~/.cabal/store
-      with:
-        path: ~/.cabal/store
-        key: ${{ runner.os }}-${{ matrix.ghc }}-v10-cabal-store
-
-    - uses: actions/cache@v1
-      name: Cache dist-newstyle
-      with:
-        path: dist-newstyle
-        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}-semantic-dist
-
-    # - name: hlint
-    #   run: |
-    #     test -f dist-newstyle/hlint || cabal install hlint --installdir=dist-newstyle
-    #     dist-newstyle/hlint src semantic-python
+    - name: Get cabal-cache
+      run: |
+        curl -L https://github.com/haskell-works/cabal-cache/releases/download/v1.0.1.8/cabal-cache_x86_64_linux.tar.gz > ./cc.tar.gz
+        tar -xvf ./cc.tar.gz
 
-    - name: Install dependencies
+    - name: Configure project
       run: |
         cabal v2-update
         cabal v2-configure --project-file=cabal.project.ci --disable-optimization --enable-benchmarks --enable-tests --write-ghc-environment-files=always -j2
-        cabal v2-build     --project-file=cabal.project.ci all --only-dependencies
+
+    - name: Restore from cache
+      run: ./cabal-cache sync-from-archive --threads=2 --archive-uri=dist-cache || true
 
     - name: Build & test
       run: |
         cabal v2-build --project-file=cabal.project.ci
         cabal v2-run   --project-file=cabal.project.ci semantic:test
+        cabal v2-run   --project-file=cabal.project.ci semantic-codeql:test
         cabal v2-run   --project-file=cabal.project.ci semantic-core:test
         cabal v2-run   --project-file=cabal.project.ci semantic-go:test
         cabal v2-run   --project-file=cabal.project.ci semantic-java:test
@@ -72,3 +69,6 @@ jobs:
         cabal v2-run   --project-file=cabal.project.ci semantic-typescript:test
         cd semantic-source; cabal v2-run --project-file=cabal.project.ci semantic-source:test; cd ..
         cd semantic-source; cabal v2-run --project-file=cabal.project.ci semantic-source:doctest -- src; cd ..
+
+    - name: Write out cache
+      run: ./cabal-cache sync-to-archive --threads=2 --archive-uri=dist-cache

.gitmodules

@@ -22,7 +22,7 @@ COPY --from=haskell /opt/ghc/8.8.1/lib/ghc-8.8.1/* /opt/ghc/8.8.1/lib/ghc-8.8.1/
 ENTRYPOINT ["/protobuf/bin/protoc", "-I/protobuf", "--plugin=protoc-gen-haskell=/usr/local/bin/proto-lens-protoc"]
 
 # Build semantic
-FROM haskell:8.8 as build
+FROM haskell:8.8.1 as build
 WORKDIR /build
 
 # Build all of semantic

Dockerfile

@@ -35,15 +35,14 @@ Available options:
 
 #### Diff
 ```
-Usage: semantic diff ([--sexpression] | [--json] | [--json-graph] | [--toc] |
+Usage: semantic diff ([--sexpression] | [--json] | [--json-graph] |
                      [--dot] | [--show]) [FILE_A] [FILE_B]
   Compute changes between paths
 
 Available options:
   --sexpression            Output s-expression diff tree (default)
   --json                   Output JSON diff trees
   --json-graph             Output JSON diff trees
-  --toc                    Output JSON table of contents diff summary
   --dot                    Output the diff as a DOT graph
   --show                   Output using the Show instance (debug only, format
                            subject to change without notice)
@@ -75,19 +74,20 @@ Available options:
 
 ## Language support
 
-| Priority | Language       | Parse | Assign | Diff  | ToC | Symbols | Import graph | Call graph | Control flow graph |
-| :---:    | :------------- | :---: | :---:  | :---: | :--:| :---:   | :---:        | :---:      | :---: |
-| 1        | Ruby           | ✅     | ✅     | ✅    | ✅  | ✅      | ✅          | 🚧 | |
-| 2        | JavaScript     | ✅     | ✅     | ✅    | ✅  | ✅      | ✅           | 🚧 | |
-| 3        | TypeScript     | ✅     | ✅     | ✅    | ✅  | ✅      | ✅          | 🚧  | |
-| 4        | Python         | ✅     | ✅     | ✅    | ✅  | ✅      | ✅           | 🚧 | |
-| 5        | Go             | ✅     | ✅     | ✅    | ✅  | ✅      | ✅           | 🚧 | |
-|          | PHP            | 🚧     | 🚧   | 🚧  | 🚧| 🚧    | | | |
-|          | Java           | 🚧     | N/A    | 🚧    | 🚧  | ✅      |               | | |
-|          | JSON           | ✅     | N/A    | ✅    | N/A | N/A     | N/A          | N/A| |
-|          | JSX            | ✅     | ✅     | ✅    | 🔶  |         |              | | |
-|          | Haskell        | 🚧     | 🚧     | 🚧    | 🔶  | 🚧       |              | | |
-|          | Markdown       | 🚧     | 🚧     | 🚧    | 🚧  | N/A     | N/A          | N/A |   |
+| Priority | Language       | Parse | Assign | Diff  | Symbols | Import graph | Call graph | Control flow graph |
+| :---:    | :------------- | :---: | :---:  | :---: | :---:   | :---:        | :---:      | :---:              |
+| 1        | Ruby           | ✅    | ✅     | ✅    | ✅      | ✅           | 🚧         |                    |
+| 2        | JavaScript     | ✅    | ✅     | ✅    | ✅      | ✅           | 🚧         |                    |
+| 3        | TypeScript     | ✅    | ✅     | ✅    | ✅      | ✅           | 🚧         |                    |
+| 4        | Python         | ✅    | ✅     | ✅    | ✅      | ✅           | 🚧         |                    |
+| 5        | Go             | ✅    | ✅     | ✅    | ✅      | ✅           | 🚧         |                    |
+|          | PHP            | 🚧    | 🚧     | 🚧    | 🚧      |              |            |                    |
+|          | Java           | 🚧    | N/A    | 🚧    | ✅      |              |            |                    |
+|          | JSON           | ✅    | N/A    | ✅    | N/A     | N/A          | N/A        |                    |
+|          | JSX            | ✅    | ✅     | ✅    |         |              |            |                    |
+|          | Haskell        | 🚧    | 🚧     | 🚧    | 🚧      |              |            |                    |
+|          | Markdown       | 🚧    | 🚧     | 🚧    | N/A     | N/A          | N/A        |               |
+|          | CodeQL         | ✅    | N/A    | 🚧    | ✅      |              |            |                    |
 
 * ✅ — Supported
 * 🔶 — Partial support
@@ -109,7 +109,7 @@ cabal v2-test
 cabal v2-run semantic -- --help
 ```
 
- `stack` as a build tool is not officially supported; there is an unofficial [`stack.yaml`](https://gist.github.com/jkachmar/f200caee83280f1f25e9cfa2dd2b16bb) available, though we cannot make guarantees as to its stability.
+ `stack` as a build tool is not officially supported; there is [unofficial `stack.yaml` support](https://github.com/jkachmar/semantic-stack-yaml) available, though we cannot make guarantees as to its stability.
 
 [nix]: https://www.haskell.org/cabal/users-guide/nix-local-build-overview.html
 [ghcup]: https://www.haskell.org/ghcup/

README.md

@@ -38,7 +38,7 @@ callGraphProject' :: ( Language.SLanguage lang
 callGraphProject' session proxy path
   | Just (SomeParser parser) <- parserForLanguage analysisParsers lang = fmap (bimap show (const ())) . runTask session $ do
   blob <- readBlobFromPath (Path.toAbsRel path)
-  package <- fmap snd <$> runParse (Duration.fromSeconds 10) (parsePackage parser (Project (Path.toString (Path.takeDirectory path)) [blob] lang []))
+  package <- fmap snd <$> runParse (Duration.fromSeconds 10) (parsePackage parser (Project (Path.toAbsRel (Path.takeDirectory path)) [blob] lang []))
   modules <- topologicalSort <$> runImportGraphToModules proxy package
   runCallGraph proxy False modules package
   | otherwise = error $ "Analysis not supported for: " <> show lang

bench/Evaluation.hs

@@ -16,7 +16,7 @@ import qualified System.Path as Path
 
 import qualified Analysis.File as File
 import           Data.Flag
-import           Proto.Semantic as P hiding (Blob, BlobPair)
+import           Proto.Semantic as P hiding (Blob)
 import           Semantic.Api.Symbols (parseSymbols)
 import           Semantic.Config as Config
 import           Semantic.Task

bench/Tagging.hs

@@ -4,6 +4,7 @@
 packages: .
           semantic-analysis
           semantic-ast
+          semantic-codeql
           semantic-core
           semantic-go
           semantic-java
@@ -16,6 +17,7 @@ packages: .
           semantic-tsx
           semantic-typescript
           semantic-tags
+          semantic-rust
 
 -- Packages brought in from other repos instead of hackage
 -- ATTENTION: remember to update cabal.project.ci when bumping SHAs here!
@@ -28,8 +30,3 @@ source-repository-package
   type: git
   location: https://github.com/antitypical/fused-syntax.git
   tag: d11e14581217590a5c67f79cbaeee35ac8acee6a
-
-source-repository-package
-  type: git
-  location: https://github.com/fused-effects/fused-effects-readline.git
-  tag: 7a96949c77c73c6e5975c8d6171ffb63eb76b467

cabal.project

@@ -4,6 +4,7 @@
 packages: .
           semantic-analysis
           semantic-ast
+          semantic-codeql
           semantic-core
           semantic-go
           semantic-java
@@ -12,6 +13,7 @@ packages: .
           semantic-php
           semantic-python
           semantic-ruby
+          semantic-rust
           semantic-scope-graph
           semantic-tsx
           semantic-typescript
@@ -29,12 +31,6 @@ source-repository-package
   location: https://github.com/antitypical/fused-syntax.git
   tag: d11e14581217590a5c67f79cbaeee35ac8acee6a
 
-source-repository-package
-  type: git
-  location: https://github.com/fused-effects/fused-effects-readline.git
-  tag: 7a96949c77c73c6e5975c8d6171ffb63eb76b467
-
-
 -- Treat warnings as errors for CI builds
 package semantic
   ghc-options: -Werror
@@ -45,6 +41,9 @@ package semantic-analysis
 package semantic-ast
   ghc-options: -Werror
 
+package semantic-codeql
+  ghc-options: -Werror
+
 package semantic-core
   ghc-options: -Werror