nvim: continue using Comment.nvim over native and mini.comment

[dotfiles.git] / vim / ultisnips / cpp.snippets

diff --git a/vim/ultisnips/cpp.snippets b/vim/ultisnips/cpp.snippets
index 372600de97653bc2165f7d8aea026f8122f1532c..a677d5f5f5c98c7be4c0118321fc1af81ddc9e04 100644 (file)
--- a/vim/ultisnips/cpp.snippets
+++ b/vim/ultisnips/cpp.snippets
@@ -2,7 +2,9 @@
 priority 1
 
 # disable horrible one word snippets
-clearsnippets pri pro pub fr mu
+clearsnippets pri pro pub fr mu t pr
+
+clearsnippets set
 
 snippet inc "#include <>" b
 #include <${1:iostream}>
@@ -28,15 +30,19 @@ snippet rule5 "Default constructors/destructors/operaters" b
 ${1:classname}() = default;
 ~$1() = default;
 $1($1 const &) = default;
-$1($1 &&) = default;
+$1($1 &&) noexcept = default;
 $1 &operator=($1 const &) = default;
-$1 &operator=($1 &&) = default;
+$1 &operator=($1 &&) noexcept = default;
+endsnippet
+
+snippet spaceship "defaulted spaceship operator <=>"
+friend auto operator<=>(${1:type} const&, $1 const&) = default;
 endsnippet
 
 snippet ns "namespace .. (namespace)"
-namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`} {
+namespace${1/.+/ /m}${1} {
 ${VISUAL}${0}
-}${1/.+/ \/\/ namespace $0/m}
+}  // namespace${1/.+/ $0/m}
 endsnippet
 
 snippet mfun "Member Function" b
@@ -46,8 +52,9 @@ ${4:void} ${1:`!p snip.rv = snip.basename or "name"`}::${2:memberFunction}(${3})
 }
 endsnippet
 
-snippet for "for loop (for)"
-for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
+clearsnippets for
+snippet fori "for loop (for)" b
+for (${4:size_t} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
 {
        ${VISUAL}${0}
 }
@@ -153,3 +160,18 @@ inline std::ostream & operator<<(std::ostream &os, ${1:Type} const & rhs)
        return os;
 }
 endsnippet
+
+snippet pragma-ignore "ignore diagnostics"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-W${1}"
+${VISUAL}${0}
+#pragma GCC diagnostic pop
+endsnippet
+
+snippet FPP "FPP Copyright" b
+// Copyright © Focal Point Positioning Limited `!v strftime("%Y")`. All Rights Reserved.
+// This code is the copyright of Focal Point Positioning Limited and
+// cannot be used, copied or distributed without the express written
+// permission of Focal Point Positioning Limited.
+${0}
+endsnippet