From ab9dc6873b95d3e160c65767e9eb330d7519c96e Mon Sep 17 00:00:00 2001
From: ujihisa <ujihisa@gmail.com>
Date: Wed, 3 Oct 2012 21:22:37 -0700
Subject: [PATCH 1/2] Adding new snip: scala

---
 autoload/neosnippet/snippets/scala.snip | 42 +++++++++++++++++++++++++
 doc/neosnippet.txt                      |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 autoload/neosnippet/snippets/scala.snip

diff --git a/autoload/neosnippet/snippets/scala.snip b/autoload/neosnippet/snippets/scala.snip
new file mode 100644
index 0000000..41c2504
--- /dev/null
+++ b/autoload/neosnippet/snippets/scala.snip
@@ -0,0 +1,42 @@
+snippet     match
+abbr        match {\n  case .. => ..
+	match {
+		case ${1} => ${0}
+	}
+
+snippet     try
+abbr        try {} catch { case ... }
+prev_word   '^'
+	try {
+		${1}
+	} catch {
+		case e${2:: Exception} => ${0}
+	}
+
+snippet     p
+abbr        println()
+prev_word   '^'
+	println(${1})${0}
+
+snippet     pn
+abbr        println('name, name)
+prev_word   '^'
+	println('${1:name}, $1)${0}
+
+snippet     main
+abbr        def main(args: Array[String]) {
+prev_word   '^'
+	def main(args: Array[String]) {
+		${0}
+	}
+
+snippet     hello
+abbr        hello2
+	object HelloWorld {
+		def main(args: Array[String]) {
+			println("Hello, world!")
+		}
+	}
+
+# scala's indent plugin doesn't work well. use hard-tab for this snippet.
+# vim: set noexpandtab :
diff --git a/doc/neosnippet.txt b/doc/neosnippet.txt
index 637922b..7bf9660 100644
--- a/doc/neosnippet.txt
+++ b/doc/neosnippet.txt
@@ -395,6 +395,7 @@ CHANGELOG			*neosnippet-changelog*
 2012-10-04
 - Refactored snippets filter.
 - Changed :NeoSnippetEdit behavior.
+- Added scala snip.
 
 2012-10-01
 - Deleted neosnippet#force_expandable().

From e7ac14bf346db97635a1c315c575f747b50ecafb Mon Sep 17 00:00:00 2001
From: ujihisa <ujihisa@gmail.com>
Date: Wed, 3 Oct 2012 21:24:24 -0700
Subject: [PATCH 2/2] scala snip tweaks

---
 autoload/neosnippet/snippets/scala.snip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoload/neosnippet/snippets/scala.snip b/autoload/neosnippet/snippets/scala.snip
index 41c2504..7917278 100644
--- a/autoload/neosnippet/snippets/scala.snip
+++ b/autoload/neosnippet/snippets/scala.snip
@@ -31,7 +31,7 @@ prev_word   '^'
 	}
 
 snippet     hello
-abbr        hello2
+abbr        object HelloWorld { def main(...) }
 	object HelloWorld {
 		def main(args: Array[String]) {
 			println("Hello, world!")