on master help sign in
Fix broken resolv.conf highlighting
94496dfDavid Peter
src/syntax_mapping.rs+5
@@ -57,6 +57,11 @@ impl<'a> SyntaxMapping<'a> {
57 .insert("*.conf", MappingTarget::MapToUnknown)
57 .insert("*.conf", MappingTarget::MapToUnknown)
58 .unwrap();
58 .unwrap();
59
59
60+ // Re-insert a mapping for resolv.conf, see #1510
61+ mapping
62+ .insert("resolv.conf", MappingTarget::MapTo("resolv"))
63+ .unwrap();
64+
60 for glob in &[
65 for glob in &[
61 "/etc/nginx/**/*.conf",
66 "/etc/nginx/**/*.conf",
62 "/etc/nginx/sites-*/**/*",
67 "/etc/nginx/sites-*/**/*",
tests/syntax-tests/create_highlighted_versions.py+4−2
@@ -12,7 +12,7 @@ BAT_OPTIONS = [
12 "--no-config",
12 "--no-config",
13 "--style=plain",
13 "--style=plain",
14 "--color=always",
14 "--color=always",
15− "--theme='1337'",
15+ "--theme=default",
16 "--italic-text=always",
16 "--italic-text=always",
17]
17]
18
18
@@ -41,7 +41,9 @@ def create_highlighted_versions(output_basepath):
41 root = os.path.dirname(os.path.abspath(__file__))
41 root = os.path.dirname(os.path.abspath(__file__))
42 sources = path.join(root, "source", "*")
42 sources = path.join(root, "source", "*")
43
43
44− for source in glob.glob(path.join(sources, "*")) + glob.glob(path.join(sources, ".*")):
44+ for source in glob.glob(path.join(sources, "*")) + glob.glob(
45+ path.join(sources, ".*")
46+ ):
45 try:
47 try:
46 env = os.environ.copy()
48 env = os.environ.copy()
47 env.pop("PAGER", None)
49 env.pop("PAGER", None)
tests/syntax-tests/highlighted/resolv.conf/resolv.confnew file+4
@@ -0,0 +1,4 @@
1+# A comment
2+domain example.com
3+nameserver 192.168.123.123
4+nameserver aa00::aaaa:0000:1234:abcd
tests/syntax-tests/source/resolv.conf/resolv.confnew file+4
@@ -0,0 +1,4 @@
1+# A comment
2+domain example.com
3+nameserver 192.168.123.123
4+nameserver aa00::aaaa:0000:1234:abcd