Skip to content

Make it work with Julia 1.7 #24

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

Merged
tkf merged 1 commit into from
Sep 19, 2021
Merged

Make it work with Julia 1.7 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,16 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
julia-version: ['1.5', '1.4', '1.3', '1.2', '1.1', '1.0', 'nightly']
julia-version:
- '~1.7.0-beta4'
- '1.6'
- '1.5'
- '1.4'
- '1.3'
- '1.2'
- '1.1'
- '1.0'
- 'nightly'
fail-fast: false
name: Test Julia ${{ matrix.julia-version }}
steps:
Expand Down
10 changes: 8 additions & 2 deletions src/InteractiveCodeSearch.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,14 @@ maybe_identifier(s) = !startswith(string(s), "#")

is_locatable(::Any) = false
is_locatable(::Function) = true
is_locatable(t::Type) = !(t <: Vararg)
# https://github.com/JuliaLang/julia/issues/29645
if VERSION < v"1.7-"
is_locatable(t::Type) = !(t <: Vararg)
else
is_locatable(t::Type) = true
# t <: Vararg now throws
# https://github.com/JuliaLang/julia/issues/41446
end

is_defined_in(child, parent) =
child !== parent && parentmodule(child) === parent
Expand Down Expand Up @@ -194,7 +200,7 @@ end
choose_method(methods::T) where T =
_choose_method(Base.IteratorSize(T), methods)

function _choose_method(::Base.HasLength, methods)
function _choose_method(::Union{Base.HasLength,Base.HasShape}, methods)
if isempty(methods)
@info "No (interesting) method found"
return
Expand Down