Commit deb3a97f61fb4811337ab44a13ee93fb5f54af70
2022-01-24T20:21:53
INI: Swap out `header` for `section` (#3304)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206
diff --git a/components/prism-ini.js b/components/prism-ini.js
index 3e261d3..4a40140 100644
--- a/components/prism-ini.js
+++ b/components/prism-ini.js
@@ -10,7 +10,7 @@ Prism.languages.ini = {
pattern: /(^[ \f\t\v]*)[#;][^\n\r]*/m,
lookbehind: true
},
- 'header': {
+ 'section': {
pattern: /(^[ \f\t\v]*)\[[^\n\r\]]*\]?/m,
lookbehind: true,
inside: {
diff --git a/components/prism-ini.min.js b/components/prism-ini.min.js
index a4e2d8e..7e16e98 100644
--- a/components/prism-ini.min.js
+++ b/components/prism-ini.min.js
@@ -1 +1 @@
-Prism.languages.ini={comment:{pattern:/(^[ \f\t\v]*)[#;][^\n\r]*/m,lookbehind:!0},header:{pattern:/(^[ \f\t\v]*)\[[^\n\r\]]*\]?/m,lookbehind:!0,inside:{"section-name":{pattern:/(^\[[ \f\t\v]*)[^ \f\t\v\]]+(?:[ \f\t\v]+[^ \f\t\v\]]+)*/,lookbehind:!0,alias:"selector"},punctuation:/\[|\]/}},key:{pattern:/(^[ \f\t\v]*)[^ \f\n\r\t\v=]+(?:[ \f\t\v]+[^ \f\n\r\t\v=]+)*(?=[ \f\t\v]*=)/m,lookbehind:!0,alias:"attr-name"},value:{pattern:/(=[ \f\t\v]*)[^ \f\n\r\t\v]+(?:[ \f\t\v]+[^ \f\n\r\t\v]+)*/,lookbehind:!0,alias:"attr-value",inside:{"inner-value":{pattern:/^("|').+(?=\1$)/,lookbehind:!0}}},punctuation:/=/};
\ No newline at end of file
+Prism.languages.ini={comment:{pattern:/(^[ \f\t\v]*)[#;][^\n\r]*/m,lookbehind:!0},section:{pattern:/(^[ \f\t\v]*)\[[^\n\r\]]*\]?/m,lookbehind:!0,inside:{"section-name":{pattern:/(^\[[ \f\t\v]*)[^ \f\t\v\]]+(?:[ \f\t\v]+[^ \f\t\v\]]+)*/,lookbehind:!0,alias:"selector"},punctuation:/\[|\]/}},key:{pattern:/(^[ \f\t\v]*)[^ \f\n\r\t\v=]+(?:[ \f\t\v]+[^ \f\n\r\t\v=]+)*(?=[ \f\t\v]*=)/m,lookbehind:!0,alias:"attr-name"},value:{pattern:/(=[ \f\t\v]*)[^ \f\n\r\t\v]+(?:[ \f\t\v]+[^ \f\n\r\t\v]+)*/,lookbehind:!0,alias:"attr-value",inside:{"inner-value":{pattern:/^("|').+(?=\1$)/,lookbehind:!0}}},punctuation:/=/};
\ No newline at end of file
diff --git a/tests/languages/ini/header_feature.test b/tests/languages/ini/header_feature.test
deleted file mode 100644
index 9f0df51..0000000
--- a/tests/languages/ini/header_feature.test
+++ /dev/null
@@ -1,86 +0,0 @@
- [foo1]
-[ "foo2" ]
-[ foo3 ]
-[" foo4 "]
-["foo5 bar5"]
-["foo6"]
-[foo7
-[foo8 bar8]
-[foo9[bar9]
-[foo10]
-[foo11]bar11]
-
-----------------------------------------------------
-
-[
- ["header", [
- ["punctuation", "["],
- ["section-name", "foo1"],
- ["punctuation", "]"]
- ]],
-
- ["header", [
- ["punctuation", "["],
- ["section-name", "\"foo2\""],
- ["punctuation", "]"]
- ]],
-
- ["header", [
- ["punctuation", "["],
- ["section-name", "foo3"],
- ["punctuation", "]"]
- ]],
-
- ["header", [
- ["punctuation", "["],
- ["section-name", "\" foo4 \""],
- ["punctuation", "]"]
- ]],
-
- ["header", [
- ["punctuation", "["],
- ["section-name", "\"foo5 bar5\""],
- ["punctuation", "]"]
- ]],
-
- ["header", [
- ["punctuation", "["],
- ["section-name", "\"foo6\""],
- ["punctuation", "]"]
- ]],
-
- ["header", [
- ["punctuation", "["],
- ["section-name", "foo7"]
- ]],
-
- ["header", [
- ["punctuation", "["],
- ["section-name", "foo8 bar8"],
- ["punctuation", "]"]
- ]],
-
- ["header", [
- ["punctuation", "["],
- ["section-name", "foo9[bar9"],
- ["punctuation", "]"]
- ]],
-
- ["header", [
- ["punctuation", "["],
- ["section-name", "foo10"],
- ["punctuation", "]"]
- ]],
-
- ["header", [
- ["punctuation", "["],
- ["section-name", "foo11"],
- ["punctuation", "]"]
- ]],
-
- "bar11]"
-]
-
-----------------------------------------------------
-
-Checks for headers (and section names).
diff --git a/tests/languages/ini/section_feature.test b/tests/languages/ini/section_feature.test
new file mode 100644
index 0000000..386ec31
--- /dev/null
+++ b/tests/languages/ini/section_feature.test
@@ -0,0 +1,86 @@
+ [foo1]
+[ "foo2" ]
+[ foo3 ]
+[" foo4 "]
+["foo5 bar5"]
+["foo6"]
+[foo7
+[foo8 bar8]
+[foo9[bar9]
+[foo10]
+[foo11]bar11]
+
+----------------------------------------------------
+
+[
+ ["section", [
+ ["punctuation", "["],
+ ["section-name", "foo1"],
+ ["punctuation", "]"]
+ ]],
+
+ ["section", [
+ ["punctuation", "["],
+ ["section-name", "\"foo2\""],
+ ["punctuation", "]"]
+ ]],
+
+ ["section", [
+ ["punctuation", "["],
+ ["section-name", "foo3"],
+ ["punctuation", "]"]
+ ]],
+
+ ["section", [
+ ["punctuation", "["],
+ ["section-name", "\" foo4 \""],
+ ["punctuation", "]"]
+ ]],
+
+ ["section", [
+ ["punctuation", "["],
+ ["section-name", "\"foo5 bar5\""],
+ ["punctuation", "]"]
+ ]],
+
+ ["section", [
+ ["punctuation", "["],
+ ["section-name", "\"foo6\""],
+ ["punctuation", "]"]
+ ]],
+
+ ["section", [
+ ["punctuation", "["],
+ ["section-name", "foo7"]
+ ]],
+
+ ["section", [
+ ["punctuation", "["],
+ ["section-name", "foo8 bar8"],
+ ["punctuation", "]"]
+ ]],
+
+ ["section", [
+ ["punctuation", "["],
+ ["section-name", "foo9[bar9"],
+ ["punctuation", "]"]
+ ]],
+
+ ["section", [
+ ["punctuation", "["],
+ ["section-name", "foo10"],
+ ["punctuation", "]"]
+ ]],
+
+ ["section", [
+ ["punctuation", "["],
+ ["section-name", "foo11"],
+ ["punctuation", "]"]
+ ]],
+
+ "bar11]"
+]
+
+----------------------------------------------------
+
+Checks for sections (and section names).