Fixes normal labeled construct end statements

Author: gnikit

syntaxes/fortran_free-form.tmLanguage.json

@@ -1352,8 +1352,11 @@
 			"comment": "Introduced in the Fortran 1990 standard.",
 			"contentName": "meta.named-construct.fortran.modern",
 			"begin": "(?ix)([a-z]\\w*)\\s*(:)(?=\\s*(?:associate|block(?!\\s*data)|critical|do|forall|if|select\\s*case|select\\s*type|select\\s*rank|where)\\b)",
-			"end": "(?i)(?!\\s*\\b(?:associate|block(?!\\s*data)|critical|do|forall|if|select\\s*case|select\\s*type|select\\s*rank|where)\\b)(?:\\b(\\1)\\b)?(?:\\s*([^\\s;!][^;!\\n]*?))?(?=\\s*[;!\\n])",
+			"end": "(?i)(?!\\s*\\b(?:associate|block(?!\\s*data)|critical|do|forall|if|select\\s*case|select\\s*type|select\\s*rank|where)\\b)(?:\\b(\\1)\\b)?([^\\s;!\\n]*?)?(?=\\s*[;!\\n])",
 			"endCaptures": {
+				"1": {
+					"name": "meta.label.end.name.fortran"
+				},
 				"2": {
 					"name": "invalid.error.named-control-constructs.fortran.modern"
 				}

test/resources/conditionals.f90

@@ -43,4 +43,13 @@
 ! stop
 if (1) stop
 if (1) stop label6
-if (1) stop "label"//"7"
+if (1) stop "label"//"7"
+
+! do loop
+do i = 1, 10
+end do
+
+! labelled do loop
+label8: do i = 1, 10
+end do label8
+

test/resources/conditionals.f90.snap

@@ -257,4 +257,42 @@
 #                   ^^ source.fortran.free meta.statement.control.if.fortran meta.statement.control.stop.fortran keyword.other.concatination.fortran
 #                     ^ source.fortran.free meta.statement.control.if.fortran meta.statement.control.stop.fortran string.quoted.double.fortran punctuation.definition.string.begin.fortran
 #                      ^ source.fortran.free meta.statement.control.if.fortran meta.statement.control.stop.fortran string.quoted.double.fortran
-#                       ^ source.fortran.free meta.statement.control.if.fortran meta.statement.control.stop.fortran string.quoted.double.fortran punctuation.definition.string.end.fortran
+#                       ^ source.fortran.free meta.statement.control.if.fortran meta.statement.control.stop.fortran string.quoted.double.fortran punctuation.definition.string.end.fortran
+>
+>! do loop
+#^ source.fortran.free comment.line.fortran
+# ^^^^^^^^ source.fortran.free comment.line.fortran
+>do i = 1, 10
+#^^ source.fortran.free meta.block.do.unlabeled.fortran keyword.control.do.fortran
+#  ^ source.fortran.free meta.block.do.unlabeled.fortran meta.loop-control.fortran
+#   ^ source.fortran.free meta.block.do.unlabeled.fortran meta.loop-control.fortran meta.parameter.fortran
+#    ^ source.fortran.free meta.block.do.unlabeled.fortran meta.loop-control.fortran
+#     ^ source.fortran.free meta.block.do.unlabeled.fortran meta.loop-control.fortran keyword.operator.assignment.fortran
+#      ^ source.fortran.free meta.block.do.unlabeled.fortran meta.loop-control.fortran
+#       ^ source.fortran.free meta.block.do.unlabeled.fortran meta.loop-control.fortran constant.numeric.fortran
+#        ^^ source.fortran.free meta.block.do.unlabeled.fortran meta.loop-control.fortran
+#          ^^ source.fortran.free meta.block.do.unlabeled.fortran meta.loop-control.fortran constant.numeric.fortran
+>end do
+#^^^^^^ source.fortran.free meta.block.do.unlabeled.fortran keyword.control.enddo.fortran
+>
+>! labelled do loop
+#^ source.fortran.free comment.line.fortran
+# ^^^^^^^^^^^^^^^^^ source.fortran.free comment.line.fortran
+>label8: do i = 1, 10
+#^^^^^^^ source.fortran.free
+#       ^ source.fortran.free meta.named-construct.fortran.modern
+#        ^^ source.fortran.free meta.named-construct.fortran.modern meta.block.do.unlabeled.fortran keyword.control.do.fortran
+#          ^ source.fortran.free meta.named-construct.fortran.modern meta.block.do.unlabeled.fortran meta.loop-control.fortran
+#           ^ source.fortran.free meta.named-construct.fortran.modern meta.block.do.unlabeled.fortran meta.loop-control.fortran meta.parameter.fortran
+#            ^ source.fortran.free meta.named-construct.fortran.modern meta.block.do.unlabeled.fortran meta.loop-control.fortran
+#             ^ source.fortran.free meta.named-construct.fortran.modern meta.block.do.unlabeled.fortran meta.loop-control.fortran keyword.operator.assignment.fortran
+#              ^ source.fortran.free meta.named-construct.fortran.modern meta.block.do.unlabeled.fortran meta.loop-control.fortran
+#               ^ source.fortran.free meta.named-construct.fortran.modern meta.block.do.unlabeled.fortran meta.loop-control.fortran constant.numeric.fortran
+#                ^^ source.fortran.free meta.named-construct.fortran.modern meta.block.do.unlabeled.fortran meta.loop-control.fortran
+#                  ^^ source.fortran.free meta.named-construct.fortran.modern meta.block.do.unlabeled.fortran meta.loop-control.fortran constant.numeric.fortran
+>end do label8
+#^^^^^^ source.fortran.free meta.named-construct.fortran.modern meta.block.do.unlabeled.fortran keyword.control.enddo.fortran
+#      ^ source.fortran.free meta.named-construct.fortran.modern
+#       ^^^^^^ source.fortran.free meta.label.end.name.fortran
+>
+>