Merge branch 'master' into containers-conf

src/syntax_mapping/builtins/common/50-aws-credentials.toml

@@ -0,0 +1,2 @@
+[mappings]
+"INI" = ["**/.aws/credentials", "**/.aws/config"]

src/syntax_mapping/builtins/common/50-json.toml

@@ -1,3 +1,3 @@
 # JSON Lines is a simple variation of JSON #2535
 [mappings]
-"JSON" = ["*.jsonl"]
+"JSON" = ["*.jsonl", "*.jsonc"]

src/syntax_mapping/builtins/common/xonsh.toml

@@ -0,0 +1,3 @@
+# Xonsh shell (https://xon.sh/)
+[mappings]
+"Python" = ["*.xsh", "*.xonshrc"]