Merge branch 'master' into sf/optimized_effects

.github/workflows/CI.yml

@@ -14,15 +14,19 @@ jobs:
       matrix:
         version:
           - '1'
-          - '1.9.0'
+          - '1.10.0'
+          - '1.11-nightly'
           - 'nightly'
-          - '1.8.5'
         os:
           - ubuntu-latest
           - macOS-latest
           - windows-latest
         arch:
           - x64
+          - x86
+        exclude:
+          - os: macOS-latest
+            arch: x86
     steps:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1
@@ -39,17 +43,14 @@ jobs:
             ${{ runner.os }}-test-${{ env.cache-name }}-
             ${{ runner.os }}-test-
             ${{ runner.os }}-
-      - name: dev TypedSyntax
-        shell: julia --color=yes --project=. {0}    # this is necessary for the next command to work on Windows
+      - name: dev TypedSyntax # dev TypedSyntax (a subdir package) since the latest version may not be registered yet
+        shell: julia --color=yes --project=. {0} # this is necessary for the next command to work on Windows
         run: 'using Pkg; Pkg.develop(path=joinpath(pwd(), "TypedSyntax"))'
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
         with:
           check_bounds: 'auto'
           coverage: 'false'
-      - name: TypedSyntax     # run the tests of TypedSyntax (a subdir package)
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: julia --project=TypedSyntax -e 'using Pkg; Pkg.test(coverage=true)'
       # - name: Coverage off  # `empty_func` test doesn't work as intended with `coverage=true`
       #   if: ${{ matrix.os == 'ubuntu-latest' }}
       #   run: julia --project -e 'using Pkg; Pkg.test("Cthulhu"; coverage=false)'

.github/workflows/TagBot.yml

@@ -4,6 +4,22 @@ on:
     types:
       - created
   workflow_dispatch:
+    inputs:
+      lookback:
+        default: 100
+permissions:
+  actions: read
+  checks: read
+  contents: write
+  deployments: read
+  issues: read
+  discussions: read
+  packages: read
+  pages: read
+  pull-requests: read
+  repository-projects: read
+  security-events: read
+  statuses: read
 jobs:
   TagBot:
     if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'

.github/workflows/TypedSyntaxCI.yml

@@ -13,11 +13,15 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.6'    # test LTS versions that are not supported by Cthulhu
+          - '1'
+          - '1.10.0'
+          - '1.11-nightly'
+          - 'nightly'
         os:
           - ubuntu-latest
         arch:
           - x64
+          - x86
     steps:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1

.gitignore

@@ -1,4 +1,5 @@
 Manifest.toml
+Manifest-*.toml
 *.jl.cov
 *.jl.*.cov
 *.jl.mem

Project.toml

@@ -1,16 +1,16 @@
 name = "Cthulhu"
 uuid = "f68482b8-f384-11e8-15f7-abe071a5a75f"
 authors = ["Valentin Churavy <[email protected]> and contributors"]
-version = "2.9.1"
+version = "2.14.0"
 
 [deps]
 CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
 FoldingTrees = "1eca21be-9b9b-4ed8-839a-6d8ae26b1781"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 JuliaSyntax = "70703baa-626e-46a2-a12c-08ffd08c73b4"
+PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
 Preferences = "21216c6a-2e73-6563-6e65-726566657250"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
-PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
 TypedSyntax = "d265eb64-f81a-44ad-a842-4247ee1503de"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
@@ -19,12 +19,16 @@ WidthLimitedIO = "b8c1c048-cf81-46c6-9da0-18c1d99e41f2"
 [compat]
 CodeTracking = "0.5, 1"
 FoldingTrees = "1"
+InteractiveUtils = "1.9"
 JuliaSyntax = "0.4"
-Preferences = "1"
 PrecompileTools = "1"
-TypedSyntax = "1.1.7"
+Preferences = "1"
+REPL = "1.9"
+TypedSyntax = "1.3.0"
+UUIDs = "1.9"
+Unicode = "1.9"
 WidthLimitedIO = "1"
-julia = "1.8.5"
+julia = "1.10.0"
 
 [extras]
 DeepDiffs = "ab62b9b5-e342-54a8-a765-a90f495de1a6"

README.md

@@ -274,8 +274,6 @@ Enter `@descend bar(x, y, z)` you can see that, for `foo(4)`, the types within `
 
 ## Viewing the internal representation of Julia code
 
-Anyone using Cthulhu to investigate the behavior of Julia's compiler will
-prefer to examine the
 While Cthulhu tries to place type-annotations on the source code, this obscures
 detail and can occassionally go awry (see details [here](TypedSyntax/README.md)).
 For anyone who needs more direct insight, it can be better to look directly at Julia's

TypedSyntax/Project.toml

@@ -1,7 +1,7 @@
 name = "TypedSyntax"
 uuid = "d265eb64-f81a-44ad-a842-4247ee1503de"
 authors = ["Tim Holy <[email protected]> and contributors"]
-version = "1.2.1"
+version = "1.4.0"
 
 [deps]
 CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
@@ -10,7 +10,7 @@ JuliaSyntax = "70703baa-626e-46a2-a12c-08ffd08c73b4"
 [compat]
 CodeTracking = "1.3"
 JuliaSyntax = "0.4"
-julia = "1.6"
+julia = "1.10.0"
 
 [extras]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

TypedSyntax/src/TypedSyntax.jl

@@ -1,7 +1,6 @@
 module TypedSyntax
 
 using Core: CodeInfo, MethodInstance, SlotNumber, SSAValue
-using Core.Compiler: TypedSlot
 using JuliaSyntax: JuliaSyntax, AbstractSyntaxData, SyntaxData, SyntaxNode, GreenNode, AbstractSyntaxNode, SyntaxHead, SourceFile,
                    head, kind, child, children, haschildren, untokenize, first_byte, last_byte, source_line, source_location,
                    sourcetext, @K_str, @KSet_str, is_infix_op_call, is_prefix_op_call, is_prec_assignment, is_operator, is_literal
@@ -11,6 +10,7 @@ using CodeTracking
 export TypedSyntaxNode
 
 include("node.jl")
+include("vscode.jl")
 include("show.jl")
 
 end