Resolve merge conflicts

UltiSnips/ada.snippets

@@ -36,15 +36,15 @@ def find_candidate(tabstop, search_type):
 endglobal
 
 snippet helloworld "Hello world example to test features" b
--- `!p snip.rv = fn`
--- Created on: `date`
--- Author(s): Yannick Reiss <yannick.reiss@nickr.eu>
--- Content: Hello world example
+--  `!p snip.rv = fn`
+--  Created on: `date`
+--  Author(s): Yannick Reiss <yannick.reiss@nickr.eu>
+--  Content: Hello world example
 with Ada.Text_IO; use Ada.Text_IO;
 
--- @name ${1:`!p snip.rv = fn[0].upper() + fn[1:].split('.')[0]`}
--- @return
--- @description Function printing hello world.
+--  @name ${1:`!p snip.rv = fn[0].upper() + fn[1:].split('.')[0]`}
+--  @return
+--  @description Function printing hello world.
 procedure $1 is
 
 begin
@@ -53,16 +53,16 @@ end $1;$0
 endsnippet
 
 snippet docstring "Document String with most important information" b
--- `!p snip.rv = fn`
--- Created on: `date`
--- Author(s): ${1:Yannick Reiß}
--- Description: ${2:`!p snip.rv = fn.split('.')[0]`}
+--  `!p snip.rv = fn`
+--  Created on: `date`
+--  Author(s): ${1:Yannick Reiß}
+--  Description: ${2:`!p snip.rv = fn.split('.')[0]`}
 $0
 endsnippet
 
 snippet procedure "insert procedure" b
--- @name $1
--- @return
+--  @name $1
+--  @return
 `!p
 snip.rv = ""
 if t[2].startswith("l"):
@@ -95,8 +95,8 @@ else:
 for variable in variables:
 	if not variable == "" and not variable.startswith("typ"):
 		variableless = variable.replace("\t", "").replace ("    ", "")
-		snip.rv += f"-- @variable {variableless}\n"
-`-- @description $4
+		snip.rv += f"\t-- @variable {variableless}\n"
+`--  @description $4
 procedure ${1:`!p snip.rv = fn.split('.')[0].capitalize()`} `!p snip.rv = "" if t[2] == "" else "("`${2:N : Natural}`!p snip.rv = "" if t[2] == "" else ")"` is
 	$3
 begin
@@ -105,8 +105,8 @@ end $1;$0
 endsnippet
 
 snippet function "insert function" b
--- @name $1
--- @return $3
+--  @name $1
+--  @return $3
 `!p
 snip.rv = ""
 if t[2].startswith("l"):
@@ -129,7 +129,7 @@ for parameter in parameters:
 for parameter in parameter_list:
 	if not parameter == "" and not parameter.startswith("typ"):
 		parameterless = parameter.replace("\t", "")
-		snip.rv += f"-- @parameter {parameterless}\n"
+		snip.rv += f"\t--  @parameter {parameterless}\n"
 ``!p
 snip.rv = ""
 if t[4].startswith("l"):
@@ -139,7 +139,7 @@ else:
 for variable in variables:
 	if not variable == "" and not variable.startswith("typ") and not variable.startswith("--"):
 		variableless = variable.replace("\t", "").replace ("    ", "")
-		snip.rv += f"-- @variable {variableless}\n"
+		snip.rv += f"\t--  @variable {variableless}\n"
 `	-- @description $5
 function ${1:`!p snip.rv = fn.split('.')[0].capitalize()`} `!p snip.rv = "" if t[2] == "" else "("`${2:N : Natural}`!p snip.rv = "" if t[2] == "" else ")"` return ${3:Natural} is
 	$4
@@ -178,7 +178,7 @@ project ${1:Default} is
 	for Main use ("${5:main.adb}");
 	for Languages use ("Ada");
 end $1;
--- Create dir? (y/): ${6:no}`!p
+--  Create dir? (y/): ${6:no}`!p
 from os import system
 if t[6] == "y":
 	system(f"mkdir -p {t[2]}")
@@ -187,7 +187,8 @@ if t[6] == "y":
 endsnippet
 
 snippet package "Create package configuration" b
-package ${1:body }${2:`!p snip.rv = fn.split('.')[0]`} is
+package ${1:body }${2:`!p package_name = fn.split('.')[0]
+snip.rv = package_name[0].upper() + package_name[1:]`} is
 	$0
 end $2;
 endsnippet

UltiSnips/all.snippets

@@ -2,8 +2,8 @@ snippet dd "Date and Time" i
 `date`
 endsnippet
 
-snippet cred "My private Credentials"
-Nicki Reiss <yannick.reiss@nickr.eu>
+snippet crednick "My private Credentials"
+Yannick Reiss <yannick.reiss@nickr.eu>
 endsnippet
 
 snippet credhsrm "Credentials HSRM"
@@ -45,3 +45,11 @@ ${9:Message}
 
 ${10:`cat ~/.signature.txt`}
 endsnippet
+
+snippet crednina "My true credentials"
+Nina Chloé Kassandra Reiß <nina.reiss@nickr.eu>
+endsnippet
+
+snippet pwd "Print the current working directory"
+`echo $(pwd)`
+endsnippet

UltiSnips/irc.snippets

@@ -0,0 +1,7 @@
+snippet ff "Freunde (fast)" A
+.freunde
+endsnippet
+
+snippet wild "Widi Schild update"
+widi: Schildupdate?
+endsnippet

UltiSnips/markdown.snippets

@@ -52,3 +52,17 @@ endsnippet
 snippet ,m "Math equation" A
 \$$1\$ $0
 endsnippet
+
+snippet bookshelf "Tagline for bookshelf" b
+`!p
+if t[1] != "":
+	snip.rv = "[CW: "
+else:
+	snip.rv = ""`$1`!p
+if t[1] != "":
+	snip.rv = "]"
+else:
+	snip.rv = ""`
+${2:Title} by ${3:Author}
+${4:Description}
+endsnippet

UltiSnips/pyenv.snippets

@@ -0,0 +1,6 @@
+global !p
+
+def print_hello():
+	print("Hello")
+
+endglobal

UltiSnips/python.snippets

@@ -11,7 +11,7 @@ if __name__ == "__main__":
 $0
 endsnippet
 
-snippet docmodule "Documentation for modules" A
+snippet docmodule "Documentation for modules"
 """
 File: `!p snip.rv = fn`
 Author: ${1:Yannick Reiß}
@@ -21,7 +21,7 @@ Description: ${2:No further description}
 $0
 endsnippet
 
-snippet def "Python Function" A
+snippet def "Python Function"
 def ${1:function}(${2}):
 	"""
 	@name $1
@@ -35,12 +35,12 @@ for param in params:
 	snip.rv += f"\t\t@param {param}\n"
 `
 	Returns:
-		$4
+		@return $4
 	"""
 	$5
 	`!p
-if t[4] != "":
-	snip.rv = f"\n    return {t[4]}"`
+if t[4] != "" and len(t[4].split(":")) > 1:
+	snip.rv = f"return {t[4].split(':')[0]}"`
 
 $0
 endsnippet

UltiSnips/tex.snippets

@@ -1,3 +1,5 @@
+extends pyenv
+
 snippet cc "Add Citation" i
 \\cite{$1}$0
 endsnippet

UltiSnips/verilog.snippets

@@ -61,3 +61,7 @@ snippet def "Definition/Constant" b
 \`define ${1:NAME} ${2:VALUE}
 $0
 endsnippet
+
+snippet filename "Get Filename" b
+// `pwd`/`!p snip.rv = fn`
+endsnippet

UltiSnips/vhdl.snippets

@@ -49,7 +49,7 @@ endsnippet
 snippet docstring "Header Comment" A
 -- `!p snip.rv = fn`
 -- Created on: `date`
--- Author(s): ${1:Alexander Graf, Carl Ries, Yannick Reiß}
+-- Author(s): ${1:Nina Chloé Reiß}
 -- Content: ${2: Entity `!p snip.rv = fn.split('.')[0]`}
 $0
 endsnippet