Merge pull request #887 from fortran-lang/feat/han190/images

sytax-highlight: Image control statement

Author: gnikit

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- Added syntax highlighting support for `sync` and `event` image control statements
+  ([#874](https://github.com/fortran-lang/vscode-fortran-support/pull/874))
 - Added schema support for fortls configuration files with autocopmletions
   ([#745](https://github.com/fortran-lang/vscode-fortran-support/issues/745))
 - Added Nightly Release Channel for the extension that triggers every day at 00:00 UTC.

schemas/fortls.schema.json

@@ -184,4 +184,4 @@
       "type": "boolean"
     }
   }
-}
+}

syntaxes/fortran_free-form.tmLanguage.json

@@ -2001,6 +2001,9 @@
         },
         {
           "include": "#where-statement"
+        },
+        {
+          "include": "#image-control-statement"
         }
       ]
     },
@@ -2853,6 +2856,131 @@
         }
       ]
     },
+    "image-control-statement": {
+      "patterns": [
+        {
+          "include": "#sync-all-statement"
+        },
+        {
+          "include": "#sync-statement"
+        },
+        {
+          "include": "#event-statement"
+        },
+        {
+          "include": "#form-team-statement"
+        },
+        {
+          "include": "#fail-image-statement"
+        }
+      ]
+    },
+    "sync-all-statement": {
+      "comment": "Introduced in the Fortran 2018 standard.",
+      "name": "meta.statement.sync-all-memory.fortran",
+      "begin": "(?i)\\b(sync all|sync memory)(\\s*(?=\\())?",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.sync-all-memory.fortran"
+        },
+        "2": {
+          "name": "punctuation.parentheses.left.fortran"
+        }
+      },
+      "end": "(?<!\\G)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parentheses.right.fortran"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#parentheses-dummy-variables"
+        }
+      ]
+    },
+    "sync-statement": {
+      "comment": "Introduced in the Fortran 2018 standard.",
+      "name": "meta.statement.sync-images-team.fortran",
+      "begin": "(?i)\\b(sync images|sync team)\\s*(?=\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.sync-images-team.fortran"
+        },
+        "2": {
+          "name": "punctuation.parentheses.left.fortran"
+        }
+      },
+      "end": "(?<!\\G)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parentheses.right.fortran"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#parentheses-dummy-variables"
+        }
+      ]
+    },
+    "event-statement": {
+      "comment": "Introduced in the Fortran 2018 standard.",
+      "name": "meta.statement.event.fortran",
+      "begin": "(?i)\\b(event post|event wait)\\s*(?=\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.event.fortran"
+        },
+        "2": {
+          "name": "punctuation.parentheses.left.fortran"
+        }
+      },
+      "end": "(?<!\\G)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parentheses.right.fortran"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#parentheses-dummy-variables"
+        }
+      ]
+    },
+    "form-team-statement": {
+      "comment": "Introduced in the Fortran 2018 standard.",
+      "name": "meta.statement.form-team.fortran",
+      "begin": "(?i)\\b(form team)\\s*(?=\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.form-team.fortran"
+        },
+        "2": {
+          "name": "punctuation.parentheses.left.fortran"
+        }
+      },
+      "end": "(?<!\\G)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parentheses.right.fortran"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#parentheses-dummy-variables"
+        }
+      ]
+    },
+    "fail-image-statement": {
+      "comment": "Introduced in the Fortran 2018 standard.",
+      "name": "meta.statement.fail-image.fortran",
+      "match": "\\b(fail image)\\b",
+      "captures": {
+        "1": {
+          "name": "keyword.control.fail-image.fortran"
+        }
+      }
+    },
     "execution-statements": {
       "patterns": [
         {

test/fortran/syntax/images.f90

@@ -0,0 +1,37 @@
+program main
+
+  use iso_fortran_env, only: team_type, event_type
+  implicit none
+
+  type(team_type) :: team
+  type(event_type) :: event[*]
+  integer :: image_index, team_index
+  integer :: status
+
+  image_index = this_image()
+  team_index = merge(1, 2, mod(image_index, 2) == 0)
+
+  !> Test form team
+  form team (team_index, team)
+
+  ! Test fail image
+  if (team_index == 1) fail image
+
+  !> Test sync all, sync memory
+  sync all
+  sync all (stat=status)
+  sync memory
+  sync memory (stat=status)
+
+  !> Test sync team, sync images
+  sync team (team_index)
+  sync team (team_index, stat=status)
+  sync images (image_index)
+  sync images (image_index, stat=status)
+
+  !> Test event post and event wait
+  event post (event[1])
+  event post (event[2])
+  event wait (event, until_count=2)
+
+end program main