# HG changeset patch # User wenzelm # Date 1471003368 -7200 # Node ID f97f2ad2486a0d6821b8f8056f4a748a68533479 # Parent 2314e99c18a78a8ba34f9dea3b532027767a90c1 proper completion of path cartouche (amending 5a7c919a4ada); diff -r 2314e99c18a7 -r f97f2ad2486a src/Tools/jEdit/src/completion_popup.scala --- a/src/Tools/jEdit/src/completion_popup.scala Fri Aug 12 13:34:59 2016 +0200 +++ b/src/Tools/jEdit/src/completion_popup.scala Fri Aug 12 14:02:48 2016 +0200 @@ -222,11 +222,16 @@ catch { case ERROR(_) => Nil } } + def is_wrapped(s: String): Boolean = + s.startsWith("\"") && s.endsWith("\"") || + s.startsWith(Symbol.open_decoded) && s.endsWith(Symbol.close_decoded) + for { r1 <- rendering.language_path(JEdit_Lib.before_caret_range(text_area, rendering)) s1 <- JEdit_Lib.try_get_text(text_area.getBuffer, r1) - s2 <- Library.try_unquote(s1) + if is_wrapped(s1) r2 = Text.Range(r1.start + 1, r1.stop - 1) + s2 = s1.substring(1, s1.length - 1) if Path.is_valid(s2) paths = complete(s2) if paths.nonEmpty