Skip to content

Commit 075c2ee

Browse files
committed
1 parent 54c40e1 commit 075c2ee

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Project.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Profile = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"
2727
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
2828
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
2929
Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
30+
SourceWalk = "2987fe4f-acca-4bd1-87ee-98b3d562f1a1"
3031
Traceur = "37b6cedf-1f77-55f8-9503-c64b63398394"
3132
TreeViews = "a2a6695c-b41b-5b7d-aed9-dbfdeacea5d7"
3233
WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29"
@@ -45,7 +46,7 @@ JuliaInterpreter = "^0.7.0"
4546
Juno = "^0.7.0"
4647
LNR = "^0.2.0"
4748
Lazy = "^0.13.2, ^0.14"
48-
MacroTools = "^0.5"
49+
MacroTools = "^0.5.1"
4950
Media = "^0.5"
5051
OrderedCollections = "^1.1"
5152
Requires = "^0.5"

src/debugger/stepper.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ using JuliaInterpreter: pc_expr, extract_args, debug_command, root, caller,
33
import JuliaInterpreter
44
import ..Atom: fullpath, handle, @msg, Inline, display_error
55
import Juno: Row
6-
using MacroTools
76

87
mutable struct DebuggerState
98
frame::Union{Nothing, Frame}

src/refactor.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using SourceWalk: textwalk, sourcewalk
2+
13
handle("renamerefactor") do data
24
@destruct [
35
oldWord,
@@ -91,9 +93,9 @@ function localrenamerefactor(oldword, newword, column, row, startrow, context, e
9193
scope === nothing && return ""
9294

9395
currentcontext = scope.bindstr
94-
newcontext = MacroTools.textwalk(currentcontext) do sym
9596
oldsym = Symbol(oldword)
9697
newsym = Symbol(newword)
98+
newcontext = textwalk(currentcontext) do sym
9799
sym === oldsym ? newsym : sym
98100
end
99101

@@ -159,7 +161,7 @@ function _globalrenamerefactor(oldword, newword, mod, expr, files)
159161
for (i, file) enumerate(files)
160162
@logmsg -1 "Refactoring: $file ($i / $total)" progress=i/total _id=id
161163

162-
MacroTools.sourcewalk(file) do ex
164+
sourcewalk(file) do ex
163165
if ex === oldsym
164166
push!(modifiedfiles, fullpath(file))
165167
newsym

0 commit comments

Comments
 (0)