Skip to content

Commit ec6ed82

Browse files
pfitzsebpfitzseb
committed
Merge branch 'master' into sp/large-file-limit
2 parents 7f99103 + 6ab1bf4 commit ec6ed82

12 files changed

+313
-84
lines changed

‎.github/workflows/jlpkgbutler-butler-workflow.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ name: Run the Julia Package Butler
33
on:
44
push:
55
branches:
6+
- main
67
- master
78
schedule:
89
- cron: '0 */1 * * *'
10+
workflow_dispatch:
911

1012
jobs:
1113
butler:
1214
name: "Run Package Butler"
1315
runs-on: ubuntu-latest
1416
steps:
15-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1618
- uses: davidanthoff/julia-pkgbutler@releases/v1
1719
with:
1820
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/jlpkgbutler-ci-master-workflow.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
name: Run CI on master
1+
name: Run CI on main
22

33
on:
44
push:
55
branches:
6+
- main
67
- master
8+
workflow_dispatch:
79

810
jobs:
911
test:
1012
runs-on: ${{ matrix.os }}
1113
strategy:
1214
matrix:
13-
julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7']
15+
julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '1.9']
1416
julia-arch: [x64, x86]
1517
os: [ubuntu-latest, windows-latest, macOS-latest]
1618
exclude:
1719
- os: macOS-latest
1820
julia-arch: x86
1921

2022
steps:
21-
- uses: actions/checkout@v2
22-
- uses: julia-actions/setup-julia@latest
23+
- uses: actions/checkout@v3
24+
- uses: julia-actions/setup-julia@v1
2325
with:
2426
version: ${{ matrix.julia-version }}
2527
arch: ${{ matrix.julia-arch }}
26-
- uses: julia-actions/julia-buildpkg@latest
28+
- uses: julia-actions/julia-buildpkg@v1
2729
env:
2830
PYTHON: ""
29-
- uses: julia-actions/julia-runtest@latest
31+
- uses: julia-actions/julia-runtest@v1
3032
env:
3133
PYTHON: ""
3234
- uses: julia-actions/julia-processcoverage@v1
33-
- uses: codecov/codecov-action@v1
35+
- uses: codecov/codecov-action@v3
3436
with:
35-
file: ./lcov.info
37+
files: ./lcov.info
3638
flags: unittests
37-
name: codecov-umbrella
38-
fail_ci_if_error: false
3939
token: ${{ secrets.CODECOV_TOKEN }}
4040

‎.github/workflows/jlpkgbutler-ci-pr-workflow.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,28 @@ jobs:
99
runs-on: ${{ matrix.os }}
1010
strategy:
1111
matrix:
12-
julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7']
12+
julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '1.9']
1313
julia-arch: [x64, x86]
1414
os: [ubuntu-latest, windows-latest, macOS-latest]
1515
exclude:
1616
- os: macOS-latest
1717
julia-arch: x86
1818

1919
steps:
20-
- uses: actions/checkout@v2
21-
- uses: julia-actions/setup-julia@latest
20+
- uses: actions/checkout@v3
21+
- uses: julia-actions/setup-julia@v1
2222
with:
2323
version: ${{ matrix.julia-version }}
2424
arch: ${{ matrix.julia-arch }}
25-
- uses: julia-actions/julia-buildpkg@latest
25+
- uses: julia-actions/julia-buildpkg@v1
2626
env:
2727
PYTHON: ""
28-
- uses: julia-actions/julia-runtest@latest
28+
- uses: julia-actions/julia-runtest@v1
2929
env:
3030
PYTHON: ""
3131
- uses: julia-actions/julia-processcoverage@v1
32-
- uses: codecov/codecov-action@v1
32+
- uses: codecov/codecov-action@v3
3333
with:
34-
file: ./lcov.info
34+
files: ./lcov.info
3535
flags: unittests
36-
name: codecov-umbrella
37-
fail_ci_if_error: false
3836
token: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/jlpkgbutler-codeformat-pr-workflow.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ name: Code Formatting
33
on:
44
push:
55
branches:
6+
- main
67
- master
8+
workflow_dispatch:
79

810
jobs:
911
format:
1012
runs-on: ubuntu-latest
1113
steps:
12-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1315
- uses: julia-actions/julia-codeformat@releases/v1
1416
- name: Create Pull Request
1517
uses: peter-evans/create-pull-request@v3

‎.github/workflows/jlpkgbutler-compathelper-workflow.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ on:
55
- cron: '00 * * * *'
66
issues:
77
types: [opened, reopened]
8+
workflow_dispatch:
89

910
jobs:
10-
compathelper:
11+
CompatHelper:
1112
name: "Run CompatHelper.jl"
1213
runs-on: ubuntu-latest
1314
steps:

‎.github/workflows/jlpkgbutler-docdeploy-workflow.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@ name: Deploy documentation
33
on:
44
push:
55
branches:
6+
- main
67
- master
78
tags:
89
- v*
10+
workflow_dispatch:
911

1012
jobs:
1113
docdeploy:
1214
runs-on: ubuntu-latest
1315
steps:
14-
- uses: actions/checkout@v2
15-
- uses: julia-actions/julia-buildpkg@latest
16+
- uses: actions/checkout@v3
17+
- uses: julia-actions/julia-buildpkg@v1
1618
env:
1719
PYTHON: ""
18-
- uses: julia-actions/julia-docdeploy@releases/v1
20+
- uses: julia-actions/julia-docdeploy@latest
1921
env:
2022
DOCUMENTER_KEY: ${{ secrets.JLPKGBUTLER_TOKEN }}
2123
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/jlpkgbutler-tagbot-workflow.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
types:
55
- created
66
workflow_dispatch:
7+
78
jobs:
89
TagBot:
910
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'

‎src/bindings.jl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,9 @@ function mark_bindings!(x::EXPR, state)
100100
end
101101
mark_parameters(CSTParser.get_sig(x))
102102
if CSTParser.defines_struct(x) # mark field block
103-
for i in 1:length(x.args[3].args)
104-
CSTParser.defines_function(x.args[3].args[i]) && continue
105-
arg = x.args[3].args[i]
106-
if kwdef && CSTParser.isassignment(arg)
103+
for arg in x.args[3].args
104+
CSTParser.defines_function(arg) && continue
105+
if kwdef && CSTParser.isassignment(arg) || arg.head === :const
107106
arg = arg.args[1]
108107
end
109108
mark_binding!(arg)

‎src/interface.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
function setup_server(env = dirname(SymbolServer.Pkg.Types.Context().env.project_file), depot = first(SymbolServer.Pkg.depots()), cache = joinpath(dirname(pathof(SymbolServer)), "..", "store"))
22
server = StaticLint.FileServer()
33
ssi = SymbolServerInstance(depot, cache)
4-
_, server.symbolserver = SymbolServer.getstore(ssi, env)
5-
server.symbol_extends = SymbolServer.collect_extended_methods(server.symbolserver)
4+
_, symbols = SymbolServer.getstore(ssi, env)
5+
extended_methods = SymbolServer.collect_extended_methods(symbols)
6+
server.external_env = ExternalEnv(symbols, extended_methods, Symbol[])
67
server
78
end
89

0 commit comments

Comments
 (0)