From 01ff7a87847a690546c62c7bd5c13823d3bb2d42 Mon Sep 17 00:00:00 2001
From: Kitson Kelly <me@kitsonkelly.com>
Date: Tue, 4 Jan 2022 17:42:33 +1100
Subject: fix(lsp): handle repeating patterns in registry correctly (#13275)

---
 cli/tests/testdata/lsp/registries/a_latest.json    |  4 ----
 cli/tests/testdata/lsp/registries/a_latest_.json   |  4 ++++
 cli/tests/testdata/lsp/registries/a_v1.0.0.json    |  4 ----
 cli/tests/testdata/lsp/registries/a_v1.0.0_.json   |  4 ++++
 cli/tests/testdata/lsp/registries/a_v1.0.0_b.json  |  3 +++
 cli/tests/testdata/lsp/registries/a_v1.0.1.json    |  4 ----
 cli/tests/testdata/lsp/registries/a_v1.0.1_.json   |  4 ++++
 cli/tests/testdata/lsp/registries/a_v2.0.0.json    |  4 ----
 cli/tests/testdata/lsp/registries/a_v2.0.0_.json   |  4 ++++
 cli/tests/testdata/lsp/registries/a_versions.json  |  5 ----
 cli/tests/testdata/lsp/registries/a_versions_.json |  5 ++++
 .../testdata/lsp/registries/a_versions_v1..json    |  4 ++++
 cli/tests/testdata/lsp/registries/b_latest.json    |  4 ----
 cli/tests/testdata/lsp/registries/b_latest_.json   |  4 ++++
 cli/tests/testdata/lsp/registries/b_v0.0.1.json    |  4 ----
 cli/tests/testdata/lsp/registries/b_v0.0.1_.json   |  4 ++++
 cli/tests/testdata/lsp/registries/b_v0.0.2.json    |  4 ----
 cli/tests/testdata/lsp/registries/b_v0.0.2_.json   |  4 ++++
 cli/tests/testdata/lsp/registries/b_v0.0.3.json    |  4 ----
 cli/tests/testdata/lsp/registries/b_v0.0.3_.json   |  4 ++++
 cli/tests/testdata/lsp/registries/b_versions.json  |  5 ----
 cli/tests/testdata/lsp/registries/b_versions_.json |  5 ++++
 .../lsp/registries/deno-import-intellisense.json   | 28 +++++++++++++++++++---
 23 files changed, 74 insertions(+), 45 deletions(-)
 delete mode 100644 cli/tests/testdata/lsp/registries/a_latest.json
 create mode 100644 cli/tests/testdata/lsp/registries/a_latest_.json
 delete mode 100644 cli/tests/testdata/lsp/registries/a_v1.0.0.json
 create mode 100644 cli/tests/testdata/lsp/registries/a_v1.0.0_.json
 create mode 100644 cli/tests/testdata/lsp/registries/a_v1.0.0_b.json
 delete mode 100644 cli/tests/testdata/lsp/registries/a_v1.0.1.json
 create mode 100644 cli/tests/testdata/lsp/registries/a_v1.0.1_.json
 delete mode 100644 cli/tests/testdata/lsp/registries/a_v2.0.0.json
 create mode 100644 cli/tests/testdata/lsp/registries/a_v2.0.0_.json
 delete mode 100644 cli/tests/testdata/lsp/registries/a_versions.json
 create mode 100644 cli/tests/testdata/lsp/registries/a_versions_.json
 create mode 100644 cli/tests/testdata/lsp/registries/a_versions_v1..json
 delete mode 100644 cli/tests/testdata/lsp/registries/b_latest.json
 create mode 100644 cli/tests/testdata/lsp/registries/b_latest_.json
 delete mode 100644 cli/tests/testdata/lsp/registries/b_v0.0.1.json
 create mode 100644 cli/tests/testdata/lsp/registries/b_v0.0.1_.json
 delete mode 100644 cli/tests/testdata/lsp/registries/b_v0.0.2.json
 create mode 100644 cli/tests/testdata/lsp/registries/b_v0.0.2_.json
 delete mode 100644 cli/tests/testdata/lsp/registries/b_v0.0.3.json
 create mode 100644 cli/tests/testdata/lsp/registries/b_v0.0.3_.json
 delete mode 100644 cli/tests/testdata/lsp/registries/b_versions.json
 create mode 100644 cli/tests/testdata/lsp/registries/b_versions_.json

(limited to 'cli/tests')

diff --git a/cli/tests/testdata/lsp/registries/a_latest.json b/cli/tests/testdata/lsp/registries/a_latest.json
deleted file mode 100644
index f9f9d111e..000000000
--- a/cli/tests/testdata/lsp/registries/a_latest.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-  "b/c.ts",
-  "d/e.js"
-]
diff --git a/cli/tests/testdata/lsp/registries/a_latest_.json b/cli/tests/testdata/lsp/registries/a_latest_.json
new file mode 100644
index 000000000..f9f9d111e
--- /dev/null
+++ b/cli/tests/testdata/lsp/registries/a_latest_.json
@@ -0,0 +1,4 @@
+[
+  "b/c.ts",
+  "d/e.js"
+]
diff --git a/cli/tests/testdata/lsp/registries/a_v1.0.0.json b/cli/tests/testdata/lsp/registries/a_v1.0.0.json
deleted file mode 100644
index f9f9d111e..000000000
--- a/cli/tests/testdata/lsp/registries/a_v1.0.0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-  "b/c.ts",
-  "d/e.js"
-]
diff --git a/cli/tests/testdata/lsp/registries/a_v1.0.0_.json b/cli/tests/testdata/lsp/registries/a_v1.0.0_.json
new file mode 100644
index 000000000..f9f9d111e
--- /dev/null
+++ b/cli/tests/testdata/lsp/registries/a_v1.0.0_.json
@@ -0,0 +1,4 @@
+[
+  "b/c.ts",
+  "d/e.js"
+]
diff --git a/cli/tests/testdata/lsp/registries/a_v1.0.0_b.json b/cli/tests/testdata/lsp/registries/a_v1.0.0_b.json
new file mode 100644
index 000000000..20ec4ad90
--- /dev/null
+++ b/cli/tests/testdata/lsp/registries/a_v1.0.0_b.json
@@ -0,0 +1,3 @@
+[
+  "b/c.ts"
+]
diff --git a/cli/tests/testdata/lsp/registries/a_v1.0.1.json b/cli/tests/testdata/lsp/registries/a_v1.0.1.json
deleted file mode 100644
index f9f9d111e..000000000
--- a/cli/tests/testdata/lsp/registries/a_v1.0.1.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-  "b/c.ts",
-  "d/e.js"
-]
diff --git a/cli/tests/testdata/lsp/registries/a_v1.0.1_.json b/cli/tests/testdata/lsp/registries/a_v1.0.1_.json
new file mode 100644
index 000000000..f9f9d111e
--- /dev/null
+++ b/cli/tests/testdata/lsp/registries/a_v1.0.1_.json
@@ -0,0 +1,4 @@
+[
+  "b/c.ts",
+  "d/e.js"
+]
diff --git a/cli/tests/testdata/lsp/registries/a_v2.0.0.json b/cli/tests/testdata/lsp/registries/a_v2.0.0.json
deleted file mode 100644
index f9f9d111e..000000000
--- a/cli/tests/testdata/lsp/registries/a_v2.0.0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-  "b/c.ts",
-  "d/e.js"
-]
diff --git a/cli/tests/testdata/lsp/registries/a_v2.0.0_.json b/cli/tests/testdata/lsp/registries/a_v2.0.0_.json
new file mode 100644
index 000000000..f9f9d111e
--- /dev/null
+++ b/cli/tests/testdata/lsp/registries/a_v2.0.0_.json
@@ -0,0 +1,4 @@
+[
+  "b/c.ts",
+  "d/e.js"
+]
diff --git a/cli/tests/testdata/lsp/registries/a_versions.json b/cli/tests/testdata/lsp/registries/a_versions.json
deleted file mode 100644
index 930e38323..000000000
--- a/cli/tests/testdata/lsp/registries/a_versions.json
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  "v1.0.0",
-  "v1.0.1",
-  "v2.0.0"
-]
diff --git a/cli/tests/testdata/lsp/registries/a_versions_.json b/cli/tests/testdata/lsp/registries/a_versions_.json
new file mode 100644
index 000000000..930e38323
--- /dev/null
+++ b/cli/tests/testdata/lsp/registries/a_versions_.json
@@ -0,0 +1,5 @@
+[
+  "v1.0.0",
+  "v1.0.1",
+  "v2.0.0"
+]
diff --git a/cli/tests/testdata/lsp/registries/a_versions_v1..json b/cli/tests/testdata/lsp/registries/a_versions_v1..json
new file mode 100644
index 000000000..1d8a865c1
--- /dev/null
+++ b/cli/tests/testdata/lsp/registries/a_versions_v1..json
@@ -0,0 +1,4 @@
+[
+  "v1.0.0",
+  "v1.0.1"
+]
diff --git a/cli/tests/testdata/lsp/registries/b_latest.json b/cli/tests/testdata/lsp/registries/b_latest.json
deleted file mode 100644
index f9f9d111e..000000000
--- a/cli/tests/testdata/lsp/registries/b_latest.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-  "b/c.ts",
-  "d/e.js"
-]
diff --git a/cli/tests/testdata/lsp/registries/b_latest_.json b/cli/tests/testdata/lsp/registries/b_latest_.json
new file mode 100644
index 000000000..f9f9d111e
--- /dev/null
+++ b/cli/tests/testdata/lsp/registries/b_latest_.json
@@ -0,0 +1,4 @@
+[
+  "b/c.ts",
+  "d/e.js"
+]
diff --git a/cli/tests/testdata/lsp/registries/b_v0.0.1.json b/cli/tests/testdata/lsp/registries/b_v0.0.1.json
deleted file mode 100644
index f9f9d111e..000000000
--- a/cli/tests/testdata/lsp/registries/b_v0.0.1.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-  "b/c.ts",
-  "d/e.js"
-]
diff --git a/cli/tests/testdata/lsp/registries/b_v0.0.1_.json b/cli/tests/testdata/lsp/registries/b_v0.0.1_.json
new file mode 100644
index 000000000..f9f9d111e
--- /dev/null
+++ b/cli/tests/testdata/lsp/registries/b_v0.0.1_.json
@@ -0,0 +1,4 @@
+[
+  "b/c.ts",
+  "d/e.js"
+]
diff --git a/cli/tests/testdata/lsp/registries/b_v0.0.2.json b/cli/tests/testdata/lsp/registries/b_v0.0.2.json
deleted file mode 100644
index f9f9d111e..000000000
--- a/cli/tests/testdata/lsp/registries/b_v0.0.2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-  "b/c.ts",
-  "d/e.js"
-]
diff --git a/cli/tests/testdata/lsp/registries/b_v0.0.2_.json b/cli/tests/testdata/lsp/registries/b_v0.0.2_.json
new file mode 100644
index 000000000..f9f9d111e
--- /dev/null
+++ b/cli/tests/testdata/lsp/registries/b_v0.0.2_.json
@@ -0,0 +1,4 @@
+[
+  "b/c.ts",
+  "d/e.js"
+]
diff --git a/cli/tests/testdata/lsp/registries/b_v0.0.3.json b/cli/tests/testdata/lsp/registries/b_v0.0.3.json
deleted file mode 100644
index f9f9d111e..000000000
--- a/cli/tests/testdata/lsp/registries/b_v0.0.3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-  "b/c.ts",
-  "d/e.js"
-]
diff --git a/cli/tests/testdata/lsp/registries/b_v0.0.3_.json b/cli/tests/testdata/lsp/registries/b_v0.0.3_.json
new file mode 100644
index 000000000..f9f9d111e
--- /dev/null
+++ b/cli/tests/testdata/lsp/registries/b_v0.0.3_.json
@@ -0,0 +1,4 @@
+[
+  "b/c.ts",
+  "d/e.js"
+]
diff --git a/cli/tests/testdata/lsp/registries/b_versions.json b/cli/tests/testdata/lsp/registries/b_versions.json
deleted file mode 100644
index 9532fbb85..000000000
--- a/cli/tests/testdata/lsp/registries/b_versions.json
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  "v0.0.1",
-  "v0.0.2",
-  "v0.0.3"
-]
diff --git a/cli/tests/testdata/lsp/registries/b_versions_.json b/cli/tests/testdata/lsp/registries/b_versions_.json
new file mode 100644
index 000000000..9532fbb85
--- /dev/null
+++ b/cli/tests/testdata/lsp/registries/b_versions_.json
@@ -0,0 +1,5 @@
+[
+  "v0.0.1",
+  "v0.0.2",
+  "v0.0.3"
+]
diff --git a/cli/tests/testdata/lsp/registries/deno-import-intellisense.json b/cli/tests/testdata/lsp/registries/deno-import-intellisense.json
index f2784d2f6..7fe514dc0 100644
--- a/cli/tests/testdata/lsp/registries/deno-import-intellisense.json
+++ b/cli/tests/testdata/lsp/registries/deno-import-intellisense.json
@@ -12,11 +12,11 @@
         {
           "key": "version",
           "documentation": "/lsp/registries/doc_${module}_${{version}}.json",
-          "url": "/lsp/registries/${module}_versions.json"
+          "url": "/lsp/registries/${module}_versions_${{version}}.json"
         },
         {
           "key": "path",
-          "url": "/lsp/registries/${module}_${{version}}.json"
+          "url": "/lsp/registries/${module}_${{version}}_${path}.json"
         }
       ]
     },
@@ -30,7 +30,29 @@
         },
         {
           "key": "path",
-          "url": "/lsp/registries/${module}_latest.json"
+          "url": "/lsp/registries/${module}_latest_${path}.json"
+        }
+      ]
+    },
+    {
+      "schema": "/std@:version?/:path*",
+      "variables": [
+        {
+          "key": "version",
+          "url": "/lsp/registries/std_${{version}}.json"
+        },
+        {
+          "key": "path",
+          "url": "/lsp/registries/std_${{version}}_${path}.json"
+        }
+      ]
+    },
+    {
+      "schema": "/std/:path*",
+      "variables": [
+        {
+          "key": "path",
+          "url": "/lsp/registries/std_latest_${path}.json"
         }
       ]
     }
-- 
cgit v1.2.3