From e7edbfd428b576e767d9d627ec8bd7279205f4b6 Mon Sep 17 00:00:00 2001
From: Erik Osheim <erik@osheim.org>
Date: Thu, 27 Sep 2012 21:47:14 -0400
Subject: [PATCH] more scala refinements

--HG--
branch : pmacs2
---
 mode/scala.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/scala.py b/mode/scala.py
index 36a36ae..74f9986 100644
--- a/mode/scala.py
+++ b/mode/scala.py
@@ -53,12 +53,12 @@ class ScalaGrammar(Grammar):
                          'scala.reserved', 'spaces', 'scala.type'),
 
         # class, object, and trait
-        PatternRule('scala.class', '(?<=(?<![a-zA-Z0-9_])class )[^0-9:\[\](){} ][^:\[(){} ]*'),
-        PatternRule('scala.object', '(?<=(?<![a-zA-Z0-9_])object )[^0-9:\[\](){} ][^:\[\](){} ]*'),
-        PatternRule('scala.trait', '(?<=(?<![a-zA-Z0-9_])trait )[^0-9:\[\](){} ][^:\[\]{}() ]*'),
+        PatternRule('scala.class', '(?<=(?<![a-zA-Z0-9_])class )[^0-9:\[\](){}\n\t ][^:\[(){}\n\t ]*'),
+        PatternRule('scala.object', '(?<=(?<![a-zA-Z0-9_])object )[^0-9:\[\](){}\n\t ][^:\[\](){}\n\t ]*'),
+        PatternRule('scala.trait', '(?<=(?<![a-zA-Z0-9_])trait )[^0-9:\[\](){}\n\t ][^:\[\]{}()\n\t ]*'),
 
         # method names
-        PatternRule('scala.def', '(?<=(?<![a-zA-Z0-9_])def )[^0-9:\[\](){} ][^:\[\]{}() ]*'),
+        PatternRule('scala.def', '(?<=(?<![a-zA-Z0-9_])def )[^0-9:\[\](){}\n\t ][^:\[\]{}()\n\t ]*'),
 
         # package names
         PatternRule('scala.package', '(?<=(?<![a-zA-Z0-9_])package )[a-zA-Z0-9_.]+'),