Added earlier recognition of intrinsic type in declarations (#56)

eirik-kjonstad · May 16, 2021 · d37ca1e · d37ca1e
1 parent 0a16258
commit d37ca1e
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/modern-fortran.sublime-syntax b/modern-fortran.sublime-syntax
@@ -119,6 +119,10 @@ contexts:
   types:
     - match: '(?i)\b{{intrinsicType}}\b(?=.*(function))' # type of return value in function
       scope: storage.type.intrinsic.fortran
+    - match: '(?i){{firstOnLine}}\b{{intrinsicType}}(?=\,)' # type declaration
+      scope: storage.type.intrinsic.fortran
+    - match: '(?i){{firstOnLine}}\b{{intrinsicType}}(?=\(.*\)\,)' # type declaration
+      scope: storage.type.intrinsic.fortran
     - match: '(?i){{firstOnLine}}\b{{intrinsicType}}\b(?=.*::)' # type declaration
       scope: storage.type.intrinsic.fortran
     - match: '(?i)\b(in|out|inout)\b'

diff --git a/syntax_test_fortran.F90 b/syntax_test_fortran.F90
@@ -924,3 +924,32 @@ MODULE SUBROUTINE MY_SUBROUTINE(A, B, C)
 !  ^^^ keyword.declaration.class.fortran
 !      ^^^^ keyword.declaration.class.fortran
 !           ^^^^^^^^^^^ entity.name.class.fortran
+   real(54)
+!  ^^^^ support.function.intrinsic.fortran
+!      ^ meta.parens.fortran punctuation.section.parens.begin.fortran
+!       ^^ meta.parens.fortran meta.number.integer.decimal.fortran constant.numeric.value.fortran
+!         ^ meta.parens.fortran punctuation.section.parens.end.fortran
+!
+   real(dp),
+!  ^^^^ storage.type.intrinsic.fortran
+!      ^ meta.parens.fortran punctuation.section.parens.begin.fortran
+!       ^^ meta.parens.fortran variable.other.fortran
+!         ^ meta.parens.fortran punctuation.section.parens.end.fortran
+!          ^ punctuation.separator.comma.fortran
+!
+   real(dp) ::
+!  ^^^^ storage.type.intrinsic.fortran
+!      ^ meta.parens.fortran punctuation.section.parens.begin.fortran
+!       ^^ meta.parens.fortran variable.other.fortran
+!         ^ meta.parens.fortran punctuation.section.parens.end.fortran
+!           ^^ punctuation.separator.double-colon.fortran
+!
+   real, dimension 
+!  ^^^^ storage.type.intrinsic.fortran
+!      ^ punctuation.separator.comma.fortran
+!        ^^^^^^^^^ storage.modifier.fortran
+!
+   integer, dimension
+!  ^^^^ storage.type.intrinsic.fortran
+
+