Merge pull request #126 from MaximeKjaer/fix-dot-exponent-literals

Fix #125: Highlight literals with dots and exponents

Author: nicolasstucki

src/typescript/Scala.tmLanguage.ts

@@ -187,7 +187,11 @@ export const scalaTmLanguage: TmLanguage = {
           name: 'constant.language.scala'
         },
         {
-          match: '\\b((0(x|X)[0-9a-fA-F_]*)|(([0-9][0-9_]*(\\.[0-9][0-9_]*)?)|(\\.[0-9][0-9_]*))((e|E)(\\+|-)?[0-9][0-9_]*)?|[0-9][0-9_]*)([LlFfDd]|UL|ul)?\\b',
+          match: '\\b(0[xX][0-9a-fA-F_]*)\\b',
+          name: 'constant.numeric.scala'
+        },
+        {
+          match: '((([0-9][0-9_]*(\\.[0-9][0-9_]*)?)|(\\.[0-9][0-9_]*))([eE](\\+|-)?[0-9][0-9_]*)?|[0-9][0-9_]*)([LlFfDd]|UL|ul)?\\b',
           name: 'constant.numeric.scala'
         },
         {

tests/snap/lexical.test.scala.snap

@@ -163,8 +163,8 @@
 #                ^^^^^^^^ source.scala constant.numeric.scala
 #                        ^^ source.scala
 #                          ^^^^^^^^ source.scala constant.numeric.scala
-#                                  ^^^ source.scala
-#                                     ^ source.scala constant.numeric.scala
+#                                  ^^ source.scala
+#                                    ^^ source.scala constant.numeric.scala
 #                                      ^^ source.scala
 #                                        ^ source.scala meta.bracket.scala
 >}

tests/unit/#105.test.scala

@@ -23,23 +23,23 @@
 //                                                    ^^^^^^ constant.numeric.scala
 
     .1e12 .1e+34 .1e-56 .1e12f .1e+34f .1e-56f .1e12d .1e+34d .1e-56d
-//   ^^^^ constant.numeric.scala
-//         ^^^^^ constant.numeric.scala
-//                ^^^^^ constant.numeric.scala
-//                       ^^^^^ constant.numeric.scala
-//                              ^^^^^^ constant.numeric.scala
-//                                      ^^^^^^ constant.numeric.scala
-//                                              ^^^^^ constant.numeric.scala
-//                                                     ^^^^^^ constant.numeric.scala
-//                                                             ^^^^^^ constant.numeric.scala
+//  ^^^^^ constant.numeric.scala
+//        ^^^^^^ constant.numeric.scala
+//               ^^^^^^ constant.numeric.scala
+//                      ^^^^^^ constant.numeric.scala
+//                             ^^^^^^^ constant.numeric.scala
+//                                     ^^^^^^^ constant.numeric.scala
+//                                             ^^^^^^ constant.numeric.scala
+//                                                    ^^^^^^^ constant.numeric.scala
+//                                                            ^^^^^^^ constant.numeric.scala
 
     .1E12 .1E+34 .1E-56 .1E12f .1E+34f .1E-56f .1E12d .1E+34d .1E-56d
-//   ^^^^ constant.numeric.scala
-//         ^^^^^ constant.numeric.scala
-//                ^^^^^ constant.numeric.scala
-//                       ^^^^^ constant.numeric.scala
-//                              ^^^^^^ constant.numeric.scala
-//                                      ^^^^^^ constant.numeric.scala
-//                                              ^^^^^ constant.numeric.scala
-//                                                     ^^^^^^ constant.numeric.scala
-//                                                             ^^^^^^ constant.numeric.scala
+//  ^^^^^ constant.numeric.scala
+//        ^^^^^^ constant.numeric.scala
+//               ^^^^^^ constant.numeric.scala
+//                      ^^^^^^ constant.numeric.scala
+//                             ^^^^^^^ constant.numeric.scala
+//                                     ^^^^^^^ constant.numeric.scala
+//                                             ^^^^^^ constant.numeric.scala
+//                                                    ^^^^^^^ constant.numeric.scala
+//                                                            ^^^^^^^ constant.numeric.scala

tests/unit/lexical.test.scala

@@ -39,7 +39,7 @@ object FloatingPointLiterals {
 //  ^^^ constant.numeric.scala
 //              ^^^^^^^^ constant.numeric.scala 
 //                        ^^^^^^^^ constant.numeric.scala 
-//                                   ^ constant.numeric.scala 
+//                                  ^^ constant.numeric.scala 
 }
 
 object Boolean {