aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattn <mattn.jp@gmail.com>2019-03-15 16:05:54 +0900
committerGitHub <noreply@github.com>2019-03-15 16:05:54 +0900
commit89a80b787754b348071a905d1705a1aaceebf59f (patch)
tree3d96e37be0b782bda7edb5ab86b04df7fc1c237f
parentbc011a7f16da82584bda70bb7b4d575c2525fa88 (diff)
parentae8e1818efe27bb946fd948fc2fe8cc3f38e0e2d (diff)
downloadvim-sonictemplate-89a80b787754b348071a905d1705a1aaceebf59f.tar.gz
vim-sonictemplate-89a80b787754b348071a905d1705a1aaceebf59f.tar.bz2
vim-sonictemplate-89a80b787754b348071a905d1705a1aaceebf59f.zip
Merge pull request #30 from Jagua/fix-postfix-escape
Fix missing backslash escape at postfix and add some postfix patterns
-rw-r--r--autoload/sonictemplate.vim1
-rw-r--r--template/go/pattern.stpl33
-rw-r--r--template/java/pattern.stpl11
3 files changed, 45 insertions, 0 deletions
diff --git a/autoload/sonictemplate.vim b/autoload/sonictemplate.vim
index a98f3e2..9397efa 100644
--- a/autoload/sonictemplate.vim
+++ b/autoload/sonictemplate.vim
@@ -340,6 +340,7 @@ function! sonictemplate#postfix()
return ''
endif
let line = getline('.')[:col('.')]
+ let line = escape(line, '\&')
for k in keys(s:pat[s:get_raw_filetype()])
let m = matchstr(line, k)
if len(m) > 0
diff --git a/template/go/pattern.stpl b/template/go/pattern.stpl
index db46c5d..1fe0989 100644
--- a/template/go/pattern.stpl
+++ b/template/go/pattern.stpl
@@ -23,3 +23,36 @@
\(\S\+\)\.query$
{{$1}}.Query("{{_cursor_}}")
+
+\(\S.*\)\.pr\%[int]$
+ fmt.Print({{$1}})
+ {{_cursor_}}
+
+\(\S.*\)\.pr\%[int]f$
+ fmt.Printf({{$1}})
+ {{_cursor_}}
+
+\(\S.*\)\.pr\%[int]l\%[n]$
+ fmt.Println({{$1}})
+ {{_cursor_}}
+
+\(\S.*\)\.fpr\%[int]$
+ fmt.Fprint({{$1}})
+ {{_cursor_}}
+
+\(\S.*\)\.fpr\%[int]f$
+ fmt.Fprintf({{$1}})
+ {{_cursor_}}
+
+\(\S.*\)\.fpr\%[int]l\%[n]$
+ fmt.Fprintln({{$1}})
+ {{_cursor_}}
+
+\(\S.*\)\.spr\%[int]$
+ {{_cursor_}} fmt.Sprint({{$1}})
+
+\(\S.*\)\.spr\%[int]f$
+ {{_cursor_}} fmt.Sprintf({{$1}})
+
+\(\S.*\)\.spr\%[int]l\%[n]$
+ {{_cursor_}} fmt.Sprintln({{$1}})
diff --git a/template/java/pattern.stpl b/template/java/pattern.stpl
new file mode 100644
index 0000000..2a48364
--- /dev/null
+++ b/template/java/pattern.stpl
@@ -0,0 +1,11 @@
+\(\S.*\)\.pr\%[int]$
+ System.out.print({{$1}});
+ {{_cursor_}}
+
+\(\S.*\)\.pr\%[int]f$
+ System.out.printf({{$1}});
+ {{_cursor_}}
+
+\(\S.*\)\.pr\%[int]l\%[n]$
+ System.out.println({{$1}});
+ {{_cursor_}}