Merge branch 'master' into feature/dataclasses

Author: gnikit

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELONG
 
+## 2.2.3
+
+### Changed
+
+- Changed reading in `json` files to be encoded as UTF-8
+  ([#51](https://github.com/gnikit/fortls/pull/51))
+
 ## 2.2.2
 
 ### Changed

fortls/intrinsics.py

@@ -142,7 +142,7 @@ def add_children(json_obj, fort_obj):
         os.path.dirname(os.path.abspath(__file__)), "statements.json"
     )
     statements = {"var_def": [], "int_stmnts": []}
-    with open(json_file, "r") as fid:
+    with open(json_file, "r", encoding="utf-8") as fid:
         intrin_file = json.load(fid)
         for key in statements:
             for name, json_obj in sorted(intrin_file[key].items()):
@@ -153,7 +153,7 @@ def add_children(json_obj, fort_obj):
         os.path.dirname(os.path.abspath(__file__)), "keywords.json"
     )
     keywords = {"var_def": [], "arg": [], "type_mem": [], "vis": [], "param": []}
-    with open(json_file, "r") as fid:
+    with open(json_file, "r", encoding="utf-8") as fid:
         intrin_file = json.load(fid)
         for key in keywords:
             for name, json_obj in sorted(intrin_file[key].items()):
@@ -164,7 +164,7 @@ def add_children(json_obj, fort_obj):
         os.path.dirname(os.path.abspath(__file__)), "intrinsic_funs.json"
     )
     int_funs = []
-    with open(json_file, "r") as fid:
+    with open(json_file, "r", encoding="utf-8") as fid:
         intrin_file = json.load(fid)
         for name, json_obj in sorted(intrin_file.items()):
             int_funs.append(create_int_object(name, json_obj, json_obj["type"]))
@@ -175,7 +175,7 @@ def add_children(json_obj, fort_obj):
         os.path.dirname(os.path.abspath(__file__)), "intrinsic_mods.json"
     )
     int_mods = []
-    with open(json_file, "r") as fid:
+    with open(json_file, "r", encoding="utf-8") as fid:
         intrin_file = json.load(fid)
         for key, json_obj in intrin_file.items():
             fort_obj = create_object(json_obj)