From cc8404c93d18b01c4636834f33e9b9e7a7310899 Mon Sep 17 00:00:00 2001
From: Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Fri, 8 Mar 2019 02:40:50 -0800
Subject: [PATCH] Linter: don't allow version_added === version_removed (#3546)

---
 api/RTCPeerConnection.json          | 15 +++++----------
 css/properties/custom-property.json | 26 ++++++--------------------
 test/test-versions.js               |  4 ++--
 3 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/api/RTCPeerConnection.json b/api/RTCPeerConnection.json
index ee420be4626358..1f3ffb7dbd3fa0 100644
--- a/api/RTCPeerConnection.json
+++ b/api/RTCPeerConnection.json
@@ -305,8 +305,7 @@
               }
             ],
             "safari": {
-              "version_added": "11",
-              "version_removed": "11"
+              "version_added": null
             },
             "safari_ios": {
               "version_added": null
@@ -1521,8 +1520,7 @@
               }
             ],
             "safari": {
-              "version_added": "11",
-              "version_removed": "11"
+              "version_added": null
             },
             "safari_ios": {
               "version_added": null
@@ -1638,8 +1636,7 @@
               }
             ],
             "safari": {
-              "version_added": "11",
-              "version_removed": "11"
+              "version_added": null
             },
             "safari_ios": {
               "version_added": null
@@ -1890,8 +1887,7 @@
               }
             ],
             "safari": {
-              "version_added": "11",
-              "version_removed": "11"
+              "version_added": null
             },
             "safari_ios": {
               "version_added": null
@@ -3728,8 +3724,7 @@
               }
             ],
             "safari": {
-              "version_added": "11",
-              "version_removed": "11"
+              "version_added": null
             },
             "safari_ios": {
               "version_added": "11",
diff --git a/css/properties/custom-property.json b/css/properties/custom-property.json
index 8d709cfe331d63..931cee00425266 100644
--- a/css/properties/custom-property.json
+++ b/css/properties/custom-property.json
@@ -197,26 +197,12 @@
               "opera": {
                 "version_added": null
               },
-              "safari": [
-                {
-                  "version_added": "11.1"
-                },
-                {
-                  "version_added": "11",
-                  "version_removed": "11",
-                  "alternative_name": "constant"
-                }
-              ],
-              "safari_ios": [
-                {
-                  "version_added": "11.1"
-                },
-                {
-                  "version_added": "11",
-                  "version_removed": "11",
-                  "alternative_name": "constant"
-                }
-              ]
+              "safari": {
+                "version_added": "11.1"
+              },
+              "safari_ios": {
+                "version_added": "11.1"
+              }
             },
             "status": {
               "experimental": true,
diff --git a/test/test-versions.js b/test/test-versions.js
index ad4b8015d823ea..94b66311efeb6e 100644
--- a/test/test-versions.js
+++ b/test/test-versions.js
@@ -48,8 +48,8 @@ function testVersions(dataFilename) {
               console.error('\x1b[31m  version_added: "' + statement.version_added + '" is not a valid version number when version_removed is present');
               console.error('  Valid', browser, 'versions are:', validBrowserVersions[browser].length > 0 ? 'true, ' + validBrowserVersions[browser].join(', ') : 'true');
               hasErrors = true;
-            } else if (typeof statement.version_added === "string" && typeof statement.version_removed === "string" && compareVersions(statement.version_added, statement.version_removed) > 0) {
-              console.error('\x1b[31m  version_added: "' + statement.version_added + '" cannot be higher than version_removed: "' + statement.version_removed + '"');
+            } else if (typeof statement.version_added === "string" && typeof statement.version_removed === "string" && compareVersions(statement.version_added, statement.version_removed) >= 0) {
+              console.error('\x1b[31m  version_removed: "' + statement.version_removed + '" must be greater than version_added: "' + statement.version_added + '"');
               hasErrors = true;
             }
           }