use CST loc utilities again

Author: MikeInnes

Manifest.toml

@@ -5,9 +5,11 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
 [[CSTParser]]
 deps = ["LibGit2", "Test", "Tokenize"]
-git-tree-sha1 = "437c93bc191cd55957b3f8dee7794b6131997c56"
+git-tree-sha1 = "82be55a328f39a11849569815a9f49911d6d7b58"
+repo-rev = "location"
+repo-url = "https://github.com/MikeInnes/CSTParser.jl"
 uuid = "00ebfdb7-1f24-5e51-bd34-a7502290713f"
-version = "0.5.2"
+version = "0.5.2+"
 
 [[Compat]]
 deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]

src/MacroTools.jl

@@ -17,7 +17,6 @@ include("examples/threading.jl")
 include("examples/forward.jl")
 
 include("patch/diff.jl")
-include("patch/location.jl")
 include("patch/cst.jl")
 
 const animals = Symbol[]

src/patch/cst.jl

@@ -1,11 +1,11 @@
 using CSTParser
-using CSTParser: EXPR, Call
+using CSTParser: EXPR, Call, Location, exprloc, charrange
 
 expridx(x, ii) = (@assert isempty(ii); x)
 expridx(x::Expr, ii) = isempty(ii) ? x : expridx(x.args[ii[1]], ii[2:end])
 
 function precedence_level(cst::EXPR, loc::Location)
-  parent = cst[MacroTools.parent(loc)]
+  parent = cst[CSTParser.parent(loc)]
   if parent isa Union{CSTParser.BinaryOpCall,CSTParser.UnaryOpCall,CSTParser.ChainOpCall}
     Base.operator_precedence(Expr(parent).args[1])
   elseif parent isa Union{CSTParser.BinarySyntaxOpCall,CSTParser.UnarySyntaxOpCall}
@@ -18,29 +18,29 @@ end
 # Get the range at loc, including trailing trivia from the previous node.
 function separator_range(cst, loc)
   i = loc.ii[end]
-  loc = MacroTools.parent(loc)
-  start = charrange(cst, child(loc, i-1))[1][1]+1
-  stop = charrange(cst, child(loc, i))[1][end]
+  loc = CSTParser.parent(loc)
+  start = charrange(cst, loc[i-1])[1][1]+1
+  stop = charrange(cst, loc[i])[1][end]
   return start:stop
 end
 
 function separator(cst, loc, x::EXPR{Call}, i)
   length(x.args) == 3 && return ""
   length(x.args) == 4 && return ", "
-  separator_range(cst, child(loc, max(i-1,4)))
+  separator_range(cst, loc[max(i-1,4)])
 end
 
 function separator(cst, loc, x::EXPR{CSTParser.Block}, i)
-  out, in = charrange(cst, child(loc, max(i-1,1)))
+  out, in = charrange(cst, loc[max(i-1,1)])
   in[end]+1:out[end]
 end
 
 function separator(cst, loc, x::CSTParser.BinaryOpCall, i)
-  separator_range(cst, child(loc, 2))
+  separator_range(cst, loc[2])
 end
 
 function separator(cst::EXPR, loc::Location)
-  parent = MacroTools.parent(loc)
+  parent = CSTParser.parent(loc)
   separator(cst, parent, cst[parent], loc.ii[end])
 end
 
@@ -57,7 +57,7 @@ function SourceFile(path::String, text = String(read(path)))
 end
 
 function replacement(src::SourceFile, p::Replace)
-  loc = expr_location(src.cst, p.idx)
+  loc = exprloc(src.cst, p.idx)
   prec = precedence_level(src.cst, loc)
   _, span = charrange(src.cst, loc)
   span => sprint(Base.show_unquoted, p.new, 0, prec)
@@ -66,9 +66,9 @@ end
 function replacement(src::SourceFile, p::Insert)
   append = p.idx[end] > length(expridx(src.ast, p.idx[1:end-1]).args)
   append && (p.idx[end] -= 1)
-  loc = expr_location(src.cst, p.idx)
+  loc = exprloc(src.cst, p.idx)
   # TODO handle cases like this more generally
-  src.cst[MacroTools.parent(loc)] isa EXPR{Call} && (loc.ii[end] = max(loc.ii[end], 2))
+  src.cst[CSTParser.parent(loc)] isa EXPR{Call} && (loc.ii[end] = max(loc.ii[end], 2))
   _, span = charrange(src.cst, loc)
   point = append ? span[end] : span[1]-1
   sep = separator(src.cst, loc)
@@ -81,7 +81,7 @@ function replacement(src::SourceFile, p::Insert)
 end
 
 function replacement(src::SourceFile, p::Delete)
-  loc = expr_location(src.cst, p.idx)
+  loc = exprloc(src.cst, p.idx)
   span, _ = charrange(src.cst, loc)
   sep = separator(src.cst, loc)
   sep isa AbstractRange || (sep = span)

src/patch/location.jl

@@ -19,7 +19,7 @@ testrep(ex, text) = textmap(_ -> Expr(:file, ex), text)
   bar(uppercase("baz"))
   """
 
-@test_broken testrep(:(using Bar), "using Foo") == "using Bar"
+@test testrep(:(using Bar), "using Foo") == "using Bar"
 
 # Insertion