[Scala] Improved bail-out behavior in function scoping

sublimehq · Dec 23, 2016 · 360fdf2 · 360fdf2
1 parent 92971b3
commit 360fdf2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/Scala/Scala.sublime-syntax b/Scala/Scala.sublime-syntax
@@ -399,10 +399,12 @@ contexts:
       push: function-tparams-brackets
     - match: ':'
       set: function-return-type-definition
-    - match: '\n'
-      set: function-type-parameter-list-newline
     - match: '(?=[\{\};]|{{nonopchar}}?={{nonopchar}})'
       pop: true
+    - match: (?=\S)
+      pop: true
+    - match: '\n'
+      set: function-type-parameter-list-newline
 
   function-type-parameter-list-newline:
     - include: decl-newline-double-check
@@ -423,6 +425,8 @@ contexts:
     - match: '(?=[\{\};]|{{nonopchar}}?={{nonopchar}})'
       pop: true
     - include: delimited-type-expression
+    - match: (?=\S)
+      pop: true
 
   function-return-type-definition-newline:
     - include: decl-newline-double-check
@@ -457,7 +461,7 @@ contexts:
       set: function-return-type-definition
     - match: '\n'
       set: function-parameter-list-newline
-    - match: '(?=[\{=])'
+    - match: '(?=\S)'
       pop: true
 
   function-parameter-list-newline:

diff --git a/Scala/syntax_test_scala.scala b/Scala/syntax_test_scala.scala
@@ -1429,3 +1429,15 @@ class Foo extends Bar
     with Bin
 //  ^^^^ keyword.declaration.scala
 //       ^^^ entity.other.inherited-class.scala
+
+def foo
+   42
+// ^^ constant.numeric.integer.scala
+
+def foo()
+   42
+// ^^ constant.numeric.integer.scala
+
+def foo():
+   42
+// ^^ constant.numeric.integer.scala