"case/diacriticSensitive" -> "case/diacritic-sensitive"

Issue #6592.
mapbox · May 2, 2018 · cf92f0f · cf92f0f
1 parent fa9c59d
commit cf92f0f
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 36 deletions.
diff --git a/docs/components/expression-metadata.js b/docs/components/expression-metadata.js
@@ -211,7 +211,7 @@ const types = {
     }],
     collator: [{
         type: 'collator',
-        parameters: [ '{ "caseSensitive": boolean, "diacriticSensitive": boolean, "locale": string }' ]
+        parameters: [ '{ "case-sensitive": boolean, "diacritic-sensitive": boolean, "locale": string }' ]
     }]
 };
 

diff --git a/src/style-spec/expression/definitions/collator.js b/src/style-spec/expression/definitions/collator.js
@@ -89,11 +89,11 @@ export class CollatorExpression implements Expression {
             return context.error(`Collator options argument must be an object.`);
 
         const caseSensitive = context.parse(
-            options['caseSensitive'] === undefined ? false : options['caseSensitive'], 1, BooleanType);
+            options['case-sensitive'] === undefined ? false : options['case-sensitive'], 1, BooleanType);
         if (!caseSensitive) return null;
 
         const diacriticSensitive = context.parse(
-            options['diacriticSensitive'] === undefined ? false : options['diacriticSensitive'], 1, BooleanType);
+            options['diacritic-sensitive'] === undefined ? false : options['diacritic-sensitive'], 1, BooleanType);
         if (!diacriticSensitive) return null;
 
         let locale = null;
@@ -127,8 +127,8 @@ export class CollatorExpression implements Expression {
 
     serialize() {
         const options = {};
-        options['caseSensitive'] = this.caseSensitive.serialize();
-        options['diacriticSensitive'] = this.diacriticSensitive.serialize();
+        options['case-sensitive'] = this.caseSensitive.serialize();
+        options['diacritic-sensitive'] = this.diacriticSensitive.serialize();
         if (this.locale) {
             options['locale'] = this.locale.serialize();
         }

diff --git a/src/style-spec/reference/v8.json b/src/style-spec/reference/v8.json
@@ -2233,7 +2233,7 @@
         }
       },
       "collator": {
-        "doc": "Returns a `collator` for use in locale-dependent comparison operations. The `caseSensitive` and `diacriticSensitive` options default to `false`. The `locale` argument specifies the IETF language tag of the locale to use. If none is provided, the default locale is used. If the requested locale is not available, the `collator` will use a system-defined fallback locale. Use `resolved-locale` to test the results of locale fallback behavior.",
+        "doc": "Returns a `collator` for use in locale-dependent comparison operations. The `case-sensitive` and `diacritic-sensitive` options default to `false`. The `locale` argument specifies the IETF language tag of the locale to use. If none is provided, the default locale is used. If the requested locale is not available, the `collator` will use a system-defined fallback locale. Use `resolved-locale` to test the results of locale fallback behavior.",
         "group": "Types",
         "sdk-support": {
           "basic functionality": {

diff --git a/test/integration/expression-tests/collator/accent-equals-de/test.json b/test/integration/expression-tests/collator/accent-equals-de/test.json
@@ -7,7 +7,7 @@
         "resolved-locale",
         [
           "collator",
-          {"caseSensitive": true, "diacriticSensitive": false, "locale": "de"}
+          {"case-sensitive": true, "diacritic-sensitive": false, "locale": "de"}
         ]
       ],
       "de"
@@ -18,7 +18,7 @@
       ["get", "rhs"],
       [
         "collator",
-        {"caseSensitive": true, "diacriticSensitive": false, "locale": "de"}
+        {"case-sensitive": true, "diacritic-sensitive": false, "locale": "de"}
       ]
     ],
     ["case", ["==", ["get", "rhs"], "ue"], true, false]
@@ -43,7 +43,7 @@
           "resolved-locale",
           [
             "collator",
-            {"caseSensitive": true, "diacriticSensitive": false, "locale": "de"}
+            {"case-sensitive": true, "diacritic-sensitive": false, "locale": "de"}
           ]
         ],
         "de"
@@ -54,7 +54,7 @@
         ["get", "rhs"],
         [
           "collator",
-          {"caseSensitive": true, "diacriticSensitive": false, "locale": "de"}
+          {"case-sensitive": true, "diacritic-sensitive": false, "locale": "de"}
         ]
       ],
       ["case", ["==", ["get", "rhs"], "ue"], true, false]

diff --git a/test/integration/expression-tests/collator/accent-lt-en/test.json b/test/integration/expression-tests/collator/accent-lt-en/test.json
@@ -5,7 +5,7 @@
     ["get", "rhs"],
     [
       "collator",
-      {"caseSensitive": true, "diacriticSensitive": false, "locale": "en"}
+      {"case-sensitive": true, "diacritic-sensitive": false, "locale": "en"}
     ]
   ],
   "inputs": [
@@ -27,7 +27,7 @@
       ["string", ["get", "rhs"]],
       [
         "collator",
-        {"caseSensitive": true, "diacriticSensitive": false, "locale": "en"}
+        {"case-sensitive": true, "diacritic-sensitive": false, "locale": "en"}
       ]
     ]
   }

diff --git a/test/integration/expression-tests/collator/accent-not-equals-en/test.json b/test/integration/expression-tests/collator/accent-not-equals-en/test.json
@@ -7,7 +7,7 @@
       ["get", "rhs"],
       [
         "collator",
-        {"caseSensitive": true, "diacriticSensitive": false, "locale": "en"}
+        {"case-sensitive": true, "diacritic-sensitive": false, "locale": "en"}
       ]
     ]
   ],
@@ -32,7 +32,7 @@
         ["get", "rhs"],
         [
           "collator",
-          {"caseSensitive": true, "diacriticSensitive": false, "locale": "en"}
+          {"case-sensitive": true, "diacritic-sensitive": false, "locale": "en"}
         ]
       ]
     ]

diff --git a/test/integration/expression-tests/collator/base-default-locale/test.json b/test/integration/expression-tests/collator/base-default-locale/test.json
@@ -3,7 +3,7 @@
     "==",
     ["string", ["get", "lhs"]],
     ["get", "rhs"],
-    ["collator", {"caseSensitive": false, "diacriticSensitive": false}]
+    ["collator", {"case-sensitive": false, "diacritic-sensitive": false}]
   ],
   "inputs": [
     [{}, {"properties": {"lhs": "a", "rhs": "a"}}],
@@ -22,7 +22,7 @@
       "==",
       ["string", ["get", "lhs"]],
       ["get", "rhs"],
-      ["collator", {"caseSensitive": false, "diacriticSensitive": false}]
+      ["collator", {"case-sensitive": false, "diacritic-sensitive": false}]
     ]
   }
 }
diff --git a/test/integration/expression-tests/collator/base-equals-en/test.json b/test/integration/expression-tests/collator/base-equals-en/test.json
@@ -5,7 +5,7 @@
     ["get", "rhs"],
     [
       "collator",
-      {"caseSensitive": false, "diacriticSensitive": false, "locale": "en"}
+      {"case-sensitive": false, "diacritic-sensitive": false, "locale": "en"}
     ]
   ],
   "inputs": [
@@ -27,7 +27,7 @@
       ["get", "rhs"],
       [
         "collator",
-        {"caseSensitive": false, "diacriticSensitive": false, "locale": "en"}
+        {"case-sensitive": false, "diacritic-sensitive": false, "locale": "en"}
       ]
     ]
   }

diff --git a/test/integration/expression-tests/collator/base-gt-en/test.json b/test/integration/expression-tests/collator/base-gt-en/test.json
@@ -5,7 +5,7 @@
     ["get", "rhs"],
     [
       "collator",
-      {"caseSensitive": false, "diacriticSensitive": false, "locale": "en"}
+      {"case-sensitive": false, "diacritic-sensitive": false, "locale": "en"}
     ]
   ],
   "inputs": [
@@ -27,7 +27,7 @@
       ["string", ["get", "rhs"]],
       [
         "collator",
-        {"caseSensitive": false, "diacriticSensitive": false, "locale": "en"}
+        {"case-sensitive": false, "diacritic-sensitive": false, "locale": "en"}
       ]
     ]
   }

diff --git a/test/integration/expression-tests/collator/case-lteq-en/test.json b/test/integration/expression-tests/collator/case-lteq-en/test.json
@@ -5,7 +5,7 @@
     ["get", "rhs"],
     [
       "collator",
-      {"caseSensitive": false, "diacriticSensitive": true, "locale": "en"}
+      {"case-sensitive": false, "diacritic-sensitive": true, "locale": "en"}
     ]
   ],
   "inputs": [
@@ -28,7 +28,7 @@
       ["string", ["get", "rhs"]],
       [
         "collator",
-        {"caseSensitive": false, "diacriticSensitive": true, "locale": "en"}
+        {"case-sensitive": false, "diacritic-sensitive": true, "locale": "en"}
       ]
     ]
   }

diff --git a/test/integration/expression-tests/collator/case-not-equals-en/test.json b/test/integration/expression-tests/collator/case-not-equals-en/test.json
@@ -7,7 +7,7 @@
       ["get", "rhs"],
       [
         "collator",
-        {"caseSensitive": false, "diacriticSensitive": true, "locale": "en"}
+        {"case-sensitive": false, "diacritic-sensitive": true, "locale": "en"}
       ]
     ]
   ],
@@ -32,7 +32,7 @@
         ["get", "rhs"],
         [
           "collator",
-          {"caseSensitive": false, "diacriticSensitive": true, "locale": "en"}
+          {"case-sensitive": false, "diacritic-sensitive": true, "locale": "en"}
         ]
       ]
     ]

diff --git a/test/integration/expression-tests/collator/case-omitted-en/test.json b/test/integration/expression-tests/collator/case-omitted-en/test.json
@@ -3,7 +3,7 @@
     "==",
     ["string", ["get", "lhs"]],
     ["get", "rhs"],
-    ["collator", {"diacriticSensitive": true, "locale": "en"}]
+    ["collator", {"diacritic-sensitive": true, "locale": "en"}]
   ],
   "inputs": [
     [{}, {"properties": {"lhs": "ä", "rhs": "a"}}],
@@ -25,7 +25,7 @@
       ["get", "rhs"],
       [
         "collator",
-        {"caseSensitive": false, "diacriticSensitive": true, "locale": "en"}
+        {"case-sensitive": false, "diacritic-sensitive": true, "locale": "en"}
       ]
     ]
   }

diff --git a/test/integration/expression-tests/collator/comparison-number-error/test.json b/test/integration/expression-tests/collator/comparison-number-error/test.json
@@ -3,7 +3,7 @@
     "<",
     1,
     2,
-    ["collator", {"caseSensitive": false, "diacriticSensitive": false}]
+    ["collator", {"case-sensitive": false, "diacritic-sensitive": false}]
   ],
   "expected": {
     "compiled": {

diff --git a/test/integration/expression-tests/collator/diacritic-omitted-en/test.json b/test/integration/expression-tests/collator/diacritic-omitted-en/test.json
@@ -3,7 +3,7 @@
     "<",
     ["string", ["get", "lhs"]],
     ["get", "rhs"],
-    ["collator", {"caseSensitive": ["==", 1, 1], "locale": "en"}]
+    ["collator", {"case-sensitive": ["==", 1, 1], "locale": "en"}]
   ],
   "inputs": [
     [{}, {"properties": {"lhs": "a", "rhs": "ä"}}],
@@ -24,7 +24,7 @@
       ["string", ["get", "rhs"]],
       [
         "collator",
-        {"caseSensitive": true, "diacriticSensitive": false, "locale": "en"}
+        {"case-sensitive": true, "diacritic-sensitive": false, "locale": "en"}
       ]
     ]
   }

diff --git a/test/integration/expression-tests/collator/equals-non-string-error/test.json b/test/integration/expression-tests/collator/equals-non-string-error/test.json
@@ -3,7 +3,7 @@
     "==",
     1,
     2,
-    ["collator", {"caseSensitive": false, "diacriticSensitive": false}]
+    ["collator", {"case-sensitive": false, "diacritic-sensitive": false}]
   ],
   "expected": {
     "compiled": {

diff --git a/test/integration/expression-tests/collator/variant-equals-en/test.json b/test/integration/expression-tests/collator/variant-equals-en/test.json
@@ -5,7 +5,7 @@
     ["get", "rhs"],
     [
       "collator",
-      {"caseSensitive": true, "diacriticSensitive": true, "locale": "en"}
+      {"case-sensitive": true, "diacritic-sensitive": true, "locale": "en"}
     ]
   ],
   "inputs": [
@@ -27,7 +27,7 @@
       ["get", "rhs"],
       [
         "collator",
-        {"caseSensitive": true, "diacriticSensitive": true, "locale": "en"}
+        {"case-sensitive": true, "diacritic-sensitive": true, "locale": "en"}
       ]
     ]
   }

diff --git a/test/integration/expression-tests/collator/variant-gteq-en/test.json b/test/integration/expression-tests/collator/variant-gteq-en/test.json
@@ -5,7 +5,7 @@
     ["get", "rhs"],
     [
       "collator",
-      {"caseSensitive": true, "diacriticSensitive": true, "locale": "en"}
+      {"case-sensitive": true, "diacritic-sensitive": true, "locale": "en"}
     ]
   ],
   "inputs": [
@@ -28,7 +28,7 @@
       ["string", ["get", "rhs"]],
       [
         "collator",
-        {"caseSensitive": true, "diacriticSensitive": true, "locale": "en"}
+        {"case-sensitive": true, "diacritic-sensitive": true, "locale": "en"}
       ]
     ]
   }

diff --git a/test/integration/expression-tests/resolved-locale/basic/test.json b/test/integration/expression-tests/resolved-locale/basic/test.json
@@ -5,7 +5,7 @@
       "resolved-locale",
       [
         "collator",
-        {"caseSensitive": true, "diacriticSensitive": true, "locale": "en"}
+        {"case-sensitive": true, "diacritic-sensitive": true, "locale": "en"}
       ]
     ],
     "en"
@@ -25,7 +25,7 @@
         "resolved-locale",
         [
           "collator",
-          {"caseSensitive": true, "diacriticSensitive": true, "locale": "en"}
+          {"case-sensitive": true, "diacritic-sensitive": true, "locale": "en"}
         ]
       ],
       "en"