Use the property attributes for Mark (#2821)

Author: kddejong

src/cfnlint/decode/cfn_json.py

@@ -15,6 +15,7 @@
 from json.scanner import NUMBER_RE
 
 import cfnlint
+from cfnlint.decode.mark import Mark
 from cfnlint.decode.node import dict_node, list_node, str_node, sub_node
 
 LOGGER = logging.getLogger(__name__)
@@ -117,17 +118,6 @@ def build_match_from_key(message, key):
     )
 
 
-class Mark:
-    """Mark of line and column"""
-
-    line = 1
-    column = 1
-
-    def __init__(self, line, column):
-        self.line = line
-        self.column = column
-
-
 # pylint: disable=W0102
 # Exception based on builtin Python Function
 def py_scanstring(s, end, strict=True, _b=BACKSLASH, _m=STRINGCHUNK.match):

src/cfnlint/decode/mark.py

@@ -0,0 +1,15 @@
+"""
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: MIT-0
+"""
+
+
+class Mark:
+    """Mark of line and column"""
+
+    line = 1
+    column = 1
+
+    def __init__(self, line, column):
+        self.line = line
+        self.column = column

src/cfnlint/decode/utils.py

@@ -3,10 +3,11 @@
 SPDX-License-Identifier: MIT-0
 """
 
+from cfnlint.decode.mark import Mark
 from cfnlint.decode.node import dict_node, list_node, str_node
 
 
-def convert_dict(template, start_mark=(0, 0), end_mark=(0, 0)):
+def convert_dict(template, start_mark=Mark(0, 0), end_mark=Mark(0, 0)):
     """Convert dict to template"""
     if isinstance(template, dict):
         if not isinstance(template, dict_node):

src/cfnlint/template/transforms/_language_extensions.py

@@ -54,14 +54,14 @@ def language_extension(cfn: Any) -> TransformResult:
 
         message = "Error transforming template: {0}"
         if hasattr(e.key, "start_mark"):
-            sm_line = e.key.start_mark[0] + 1
-            sm_column = e.key.start_mark[1] + 1
+            sm_line = e.key.start_mark.line + 1
+            sm_column = e.key.start_mark.column + 1
         else:
             sm_line = 1
             sm_column = 1
         if hasattr(e.key, "end_mark"):
-            em_line = e.key.end_mark[0] + 1
-            em_column = e.key.end_mark[1] + 1
+            em_line = e.key.end_mark.line + 1
+            em_column = e.key.end_mark.column + 1
         else:
             em_line = 1
             em_column = 1