diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets index 2e00a39..3d5c9c7 100644 --- a/UltiSnips/c.snippets +++ b/UltiSnips/c.snippets @@ -8,13 +8,13 @@ endsnippet snippet fun "New Function" ${1:int} ${2:MyFunc} (${3:void}) { `!p -if t[1] != "void": - snip.rv = f"{t[1]} rv = 0;" +if t[1].replace('static ', '') != "void": + snip.rv = f"{t[1].replace('static ', '')} rv = 0;" else: snip.rv = ""` $5 `!p -if t[1] != "void": +if t[1].replace('static ', '') != "void": snip.rv = f"return rv;" else: snip.rv = ""` @@ -25,13 +25,13 @@ endsnippet snippet "(\w+)->fun" "Struct function" r ${1:int} ${2:Name} (`!p snip.rv = match.group(1)`* self, ${4:void}) { `!p -if t[1] != "void": - snip.rv = f"{t[1]} rv = 0;" +if t[1].replace('static ', '') != "void": + snip.rv = f"{t[1].replace('static ', '')} rv = 0;" else: snip.rv = ""` $5 `!p -if t[1] != "void": +if t[1].replace('static ', '') != "void": snip.rv = f"return rv;" else: snip.rv = ""` @@ -74,13 +74,13 @@ snip.rv = rval` */ ${1:int} ${2:MyFunc} (${3:void}) { `!p -if t[1] != "void": - snip.rv = f"{t[1]} rv = 0;" +if t[1].replace('static ', '') != "void": + snip.rv = f"{t[1].replace('static ', '')} rv = 0;" else: snip.rv = ""` $5 `!p -if t[1] != "void": +if t[1].replace('static ', '') != "void": snip.rv = f"return rv;" else: snip.rv = ""` diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets index cedddd0..cbc8816 100644 --- a/UltiSnips/cpp.snippets +++ b/UltiSnips/cpp.snippets @@ -17,7 +17,7 @@ endsnippet snippet exfun "New Function with Documentation" /** * @name $2 - * @return $1 + * @return `!p t[1].replace("static ", "")` * @brief ${4: Description} * `!p @@ -31,12 +31,12 @@ snip.rv = rval` ${1:int} ${2:MyFunc} (${3:void}) { `!p if t[1] != "void": - snip.rv = f"{t[1]} rv = 0;" + snip.rv = f"{t[1].replace('static ', '')} rv = 0;" else: snip.rv = ""` $5 `!p -if t[1] != "void": +if t[1].replace("static ", "") != "void": snip.rv = f"return rv;" else: snip.rv = ""` @@ -49,7 +49,7 @@ ${1:int} ${2:Name} (${3:void}) { $5 return ${6:`!p -if t[1] != "void": +if t[1].replace("static ", "") != "void": snip.rv = f"0" else: snip.rv = ""`}; diff --git a/UltiSnips/markdown.snippets b/UltiSnips/markdown.snippets index 3eccc3f..daf14d8 100644 --- a/UltiSnips/markdown.snippets +++ b/UltiSnips/markdown.snippets @@ -13,6 +13,14 @@ $1 $0 endsnippet +snippet cc "C Code" b +\`\`\`c +$1 +\`\`\` +$0 +endsnippet + + snippet csql "SQL Code" \`\`\`sql $1