From ebbbd8d819d13c88049fbe3d2bda8bdb29bcd1e2 Mon Sep 17 00:00:00 2001
From: Erik Osheim <erik@osheim.org>
Date: Thu, 9 Dec 2010 13:14:36 -0500
Subject: [PATCH] fix bug with :: in scala-mode

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

diff --git a/mode/scala.py b/mode/scala.py
index 927bb03..ab6a80b 100644
--- a/mode/scala.py
+++ b/mode/scala.py
@@ -40,9 +40,9 @@ class ScalaGrammar(Grammar):
         RegionRule('scala.comment', r'/\*', NestedCommentGrammar, r'\*/'),
         RegionRule('scala.script', r'#!.+$', ShGrammar, r'!#'),
 
-        PatternMatchRule('x', r'(:)([a-zA-Z0-9_]+)',
+        PatternMatchRule('x', r'(?<!:)(:)([a-zA-Z0-9_]+)',
                          'delimiter', 'scala.type'),
-        PatternMatchRule('x', r'(:)( +)([a-zA-Z0-9_]+)',
+        PatternMatchRule('x', r'(?<!:)(:)( +)([a-zA-Z0-9_]+)',
                          'delimiter', 'spaces', 'scala.type'),
         #PatternMatchRule('x', r'(?<=[a-zA-Z0-9_ ])(:)([a-zA-Z0-9_]+)',
         #                 'delimiter', 'scala.type'),