(IJPL-785) Plugin Import: get rid of the old data

#IJPL-785 Fixed

GitOrigin-RevId: 768f07ce7fa4e9099afb5549fdffb864499f6dcb

plugins/ide-startup/importSettings/resources/pluginData/aq.json

@@ -9,6 +9,11 @@
     "ideaName": "vscode-database",
     "builtIn": true
   },
+  {
+    "vsCodeId": "bungcip.better-toml",
+    "ideaName": "Toml",
+    "ideaId": "org.toml.lang"
+  },
   {
     "vsCodeId": "cweijan.vscode-mysql-client2",
     "ideaName": "Database Tools and SQL",
@@ -24,6 +29,11 @@
     "ideaName": "GitLens — Git supercharged",
     "builtIn": true
   },
+  {
+    "vsCodeId": "EditorConfig.EditorConfig",
+    "ideaName": "EditorConfig",
+    "ideaId": "org.editorconfig.editorconfigjetbrains"
+  },
   {
     "vsCodeId": "emilast.LogFileHighlighter",
     "ideaName": "Ideolog",
@@ -34,6 +44,11 @@
     "ideaName": "Auto Rename Tag",
     "builtIn": true
   },
+  {
+    "vsCodeId": "formulahendry.code-runner",
+    "ideaName": "Code Runner",
+    "builtIn": true
+  },
   {
     "vsCodeId": "formulahendry.vscode-mysql",
     "ideaName": "Database Tools and SQL",
@@ -44,6 +59,11 @@
     "ideaName": "GitHub Pull Requests and Issues",
     "builtIn": true
   },
+  {
+    "vsCodeId": "GitLab.gitlab-workflow",
+    "ideaName": "GitLab",
+    "ideaId": "org.jetbrains.plugins.gitlab"
+  },
   {
     "vsCodeId": "GraphQL.vscode-graphql",
     "ideaName": "GraphQL",
@@ -59,26 +79,76 @@
     "ideaName": "Terraform and HCL",
     "ideaId": "org.intellij.plugins.hcl"
   },
+  {
+    "vsCodeId": "mhutchie.git-graph",
+    "ideaName": "Git Graph",
+    "builtIn": true
+  },
   {
     "vsCodeId": "mongodb.mongodb-vscode",
     "ideaName": "Database Tools and SQL",
     "ideaId": "com.intellij.database"
   },
+  {
+    "vsCodeId": "ms-azuretools.vscode-docker",
+    "ideaName": "Docker",
+    "ideaId": "Docker"
+  },
   {
     "vsCodeId": "MS-CEINTL.vscode-language-pack-ja",
     "ideaName": "Japanese Language Pack / 日本語言語パック",
     "ideaId": "com.intellij.ja"
   },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-ko",
+    "ideaName": "Korean Language Pack / 한국어 언어 팩",
+    "ideaId": "com.intellij.ko"
+  },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-zh-hans",
+    "ideaName": "Chinese (Simplified) Language Pack / 中文语言包",
+    "ideaId": "com.intellij.zh"
+  },
+  {
+    "vsCodeId": "ms-vscode.node-debug2",
+    "ideaName": "Node.js",
+    "ideaId": "NodeJS"
+  },
   {
     "vsCodeId": "mtxr.sqltools-driver-mysql",
     "ideaName": "SQLTools MySQL/MariaDB/TiDB",
     "builtIn": true
   },
+  {
+    "vsCodeId": "ritwickdey.LiveServer",
+    "ideaName": "Live Server",
+    "builtIn": true
+  },
   {
     "vsCodeId": "streetsidesoftware.code-spell-checker",
     "ideaName": "Grazie Lite",
     "ideaId": "tanvd.grazi"
   },
+  {
+    "vsCodeId": "vscjava.vscode-gradle",
+    "ideaName": "Gradle",
+    "ideaId": "com.intellij.gradle"
+  },
+  {
+    "vsCodeId": "vscjava.vscode-maven",
+    "ideaName": "Maven for Java",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "waderyan.gitblame",
+    "ideaName": "Git Blame",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "wayou.vscode-todo-highlight",
+    "ideaName": "TODO Highlight",
+    "builtIn": true
+  },
   {
     "vsCodeId": "yzhang.markdown-all-in-one",
     "ideaName": "Markdown",

plugins/ide-startup/importSettings/resources/pluginData/cl.json

@@ -129,6 +129,11 @@
     "ideaName": "GitHub Pull Requests and Issues",
     "builtIn": true
   },
+  {
+    "vsCodeId": "GitLab.gitlab-workflow",
+    "ideaName": "GitLab",
+    "ideaId": "org.jetbrains.plugins.gitlab"
+  },
   {
     "vsCodeId": "GraphQL.vscode-graphql",
     "ideaName": "GraphQL",
@@ -249,6 +254,11 @@
     "ideaName": "C/C++ Themes",
     "builtIn": true
   },
+  {
+    "vsCodeId": "ms-vscode.node-debug2",
+    "ideaName": "Node.js",
+    "ideaId": "NodeJS"
+  },
   {
     "vsCodeId": "ms-vscode.remote-explorer",
     "ideaName": "Remote Explorer",
@@ -354,6 +364,16 @@
     "ideaName": "Vue.js",
     "ideaId": "org.jetbrains.plugins.vue"
   },
+  {
+    "vsCodeId": "waderyan.gitblame",
+    "ideaName": "Git Blame",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "wayou.vscode-todo-highlight",
+    "ideaName": "TODO Highlight",
+    "builtIn": true
+  },
   {
     "vsCodeId": "wholroyd.jinja",
     "ideaName": "Python",

plugins/ide-startup/importSettings/resources/pluginData/dg.json

@@ -9,6 +9,11 @@
     "ideaName": "SQL Formatter",
     "builtIn": true
   },
+  {
+    "vsCodeId": "bungcip.better-toml",
+    "ideaName": "Toml",
+    "ideaId": "org.toml.lang"
+  },
   {
     "vsCodeId": "cweijan.vscode-mysql-client2",
     "ideaName": "Database Tools and SQL",
@@ -29,6 +34,11 @@
     "ideaName": "HTML CSS Support",
     "builtIn": true
   },
+  {
+    "vsCodeId": "EditorConfig.EditorConfig",
+    "ideaName": "EditorConfig",
+    "ideaId": "org.editorconfig.editorconfigjetbrains"
+  },
   {
     "vsCodeId": "emilast.LogFileHighlighter",
     "ideaName": "Ideolog",
@@ -39,11 +49,26 @@
     "ideaName": "Database Tools and SQL",
     "ideaId": "com.intellij.database"
   },
+  {
+    "vsCodeId": "GitHub.vscode-pull-request-github",
+    "ideaName": "GitHub Pull Requests and Issues",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "GitLab.gitlab-workflow",
+    "ideaName": "GitLab",
+    "ideaId": "org.jetbrains.plugins.gitlab"
+  },
   {
     "vsCodeId": "GraphQL.vscode-graphql",
     "ideaName": "GraphQL",
     "ideaId": "com.intellij.lang.jsgraphql"
   },
+  {
+    "vsCodeId": "mhutchie.git-graph",
+    "ideaName": "Git Graph",
+    "builtIn": true
+  },
   {
     "vsCodeId": "mongodb.mongodb-vscode",
     "ideaName": "Database Tools and SQL",
@@ -59,6 +84,16 @@
     "ideaName": "Japanese Language Pack / 日本語言語パック",
     "ideaId": "com.intellij.ja"
   },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-ko",
+    "ideaName": "Korean Language Pack / 한국어 언어 팩",
+    "ideaId": "com.intellij.ko"
+  },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-zh-hans",
+    "ideaName": "Chinese (Simplified) Language Pack / 中文语言包",
+    "ideaId": "com.intellij.zh"
+  },
   {
     "vsCodeId": "ms-vscode-remote.remote-ssh",
     "ideaName": "Remote - SSH",
@@ -71,7 +106,7 @@
   },
   {
     "vsCodeId": "mtxr.sqltools",
-    "ideaName": "Database Support",
+    "ideaName": "SQLTools",
     "builtIn": true
   },
   {
@@ -89,6 +124,16 @@
     "ideaName": "Grazie Lite",
     "ideaId": "tanvd.grazi"
   },
+  {
+    "vsCodeId": "waderyan.gitblame",
+    "ideaName": "Git Blame",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "wayou.vscode-todo-highlight",
+    "ideaName": "TODO Highlight",
+    "builtIn": true
+  },
   {
     "vsCodeId": "yzhang.markdown-all-in-one",
     "ideaName": "Markdown",

plugins/ide-startup/importSettings/resources/pluginData/ds.json

@@ -19,6 +19,11 @@
     "ideaName": "Toml",
     "ideaId": "org.toml.lang"
   },
+  {
+    "vsCodeId": "bungcip.better-toml",
+    "ideaName": "Toml",
+    "ideaId": "org.toml.lang"
+  },
   {
     "vsCodeId": "codezombiech.gitignore",
     "ideaName": "gitignore",
@@ -101,8 +106,8 @@
   },
   {
     "vsCodeId": "GitLab.gitlab-workflow",
-    "ideaName": "GitLab Workflow",
-    "builtIn": true
+    "ideaName": "GitLab",
+    "ideaId": "org.jetbrains.plugins.gitlab"
   },
   {
     "vsCodeId": "GraphQL.vscode-graphql",
@@ -154,6 +159,11 @@
     "ideaName": "MagicPython",
     "builtIn": true
   },
+  {
+    "vsCodeId": "mhutchie.git-graph",
+    "ideaName": "Git Graph",
+    "builtIn": true
+  },
   {
     "vsCodeId": "mquandalle.graphql",
     "ideaName": "GraphQL",
@@ -169,6 +179,11 @@
     "ideaName": "Japanese Language Pack / 日本語言語パック",
     "ideaId": "com.intellij.ja"
   },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-ko",
+    "ideaName": "Korean Language Pack / 한국어 언어 팩",
+    "ideaId": "com.intellij.ko"
+  },
   {
     "vsCodeId": "MS-CEINTL.vscode-language-pack-zh-hans",
     "ideaName": "Chinese (Simplified) Language Pack / 中文语言包",
@@ -319,6 +334,16 @@
     "ideaName": "IdeaVim",
     "ideaId": "IdeaVIM"
   },
+  {
+    "vsCodeId": "waderyan.gitblame",
+    "ideaName": "Git Blame",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "wayou.vscode-todo-highlight",
+    "ideaName": "TODO Highlight",
+    "builtIn": true
+  },
   {
     "vsCodeId": "wholroyd.jinja",
     "ideaName": "Python",

plugins/ide-startup/importSettings/resources/pluginData/general.json

@@ -1,117 +0,0 @@
-[
-  {
-    "vsCodeId": "bungcip.better-toml",
-    "ideaName": "TOML",
-    "ideaId": "org.toml.lang"
-  },
-  {
-    "vsCodeId": "donjayamanne.githistory",
-    "ideaName": "Git",
-    "builtIn": true
-  },
-  {
-    "vsCodeId": "eamodio.gitlens",
-    "ideaName": "Git",
-    "builtIn": true
-  },
-  {
-    "vsCodeId": "editorconfig.editorconfig",
-    "ideaName": "editorconfig",
-    "builtIn": true
-  },
-  {
-    "vsCodeId": "emilast.LogFileHighlighter",
-    "ideaName": "Ideolog",
-    "ideaId": "com.intellij.ideolog"
-  },
-  {
-    "vsCodeId": "formulahendry.code-runner",
-    "ideaName": "Run Configurations",
-    "builtIn": true
-  },
-  {
-    "vsCodeId": "github.vscode-pull-request-github",
-    "ideaName": "GitHub",
-    "builtIn": true
-  },
-  {
-    "vsCodeId": "gitLab.gitlab-workflow",
-    "ideaName": "GitLab",
-    "builtIn": true
-  },
-  {
-    "vsCodeId": "mhutchie.git-graph",
-    "ideaName": "Git",
-    "builtIn": true
-  },
-  {
-    "vsCodeId": "ms-azuretools.vscode-docker",
-    "ideaName": "Docker",
-    "builtIn": true
-  },
-  {
-    "vsCodeId": "ms-ceintl.vscode-language-pack-ja",
-    "ideaName": "Japanese Language Pack / 日本語言語パック",
-    "ideaId": "com.intellij.ja"
-  },
-  {
-    "vsCodeId": "ms-ceintl.vscode-language-pack-ko",
-    "ideaName": "Korean Language Pack / 한국어 언어 팩",
-    "ideaId": "com.intellij.ko"
-  },
-  {
-    "vsCodeId": "ms-ceintl.vscode-language-pack-zh-hans",
-    "ideaName": "Chinese (Simplified) Language Pack / 中文语言包",
-    "ideaId": "com.intellij.zh"
-  },
-  {
-    "vsCodeId": "ms-kubernetes-tools.vscode-kubernetes-tools",
-    "ideaName": "Kubernetes",
-    "ideaId": "com.intellij.kubernetes"
-  },
-  {
-    "vsCodeId": "ms-vscode-remote.remote-wsl",
-    "ideaName": "WSL",
-    "builtIn": true
-  },
-  {
-    "vsCodeId": "ms-vscode.node-debug2",
-    "ideaName": "NodeJS support",
-    "builtIn": true
-  },
-  {
-    "vsCodeId": "msveden.teamcity-checker",
-    "ideaName": "TeamCity",
-    "ideaId": "JetBrains TeamCity Plugin"
-  },
-  {
-    "vsCodeId": "ritwickdey.LiveServer",
-    "ideaName": "Web support",
-    "builtIn": true
-  },
-  {
-    "vsCodeId": "streetsidesoftware.code-spell-checker",
-    "ideaName": "Spell Checker",
-    "builtIn": true
-  },
-  {
-    "vsCodeId": "vscodevim.vim",
-    "ideaName": "IdeaVIM",
-    "ideaId": "IdeaVIM"
-  },
-  {
-    "vsCodeId": "waderyan.gitblame",
-    "ideaName": "Git",
-    "builtIn": true
-  },
-  {
-    "vsCodeId": "wayou.vscode-todo-highlight",
-    "ideaName": "Language Support",
-    "builtIn": true
-  },
-  {
-    "vsCodeId": "xinyayang0506.log-analysis",
-    "ideaName": "Ideolog",
-    "ideaId": "com.intellij.ideolog"
-  }
-]

plugins/ide-startup/importSettings/resources/pluginData/go.json

@@ -206,8 +206,8 @@
   },
   {
     "vsCodeId": "GitLab.gitlab-workflow",
-    "ideaName": "GitLab Workflow",
-    "builtIn": true
+    "ideaName": "GitLab",
+    "ideaId": "org.jetbrains.plugins.gitlab"
   },
   {
     "vsCodeId": "golang.Go",
@@ -349,6 +349,11 @@
     "ideaName": "Remote Development",
     "builtIn": true
   },
+  {
+    "vsCodeId": "ms-vscode.node-debug2",
+    "ideaName": "Node.js",
+    "ideaId": "NodeJS"
+  },
   {
     "vsCodeId": "ms-vscode.sublime-keybindings",
     "ideaName": "Sublime Text Keymap",
@@ -384,11 +389,6 @@
     "ideaName": "SQLTools PostgreSQL/Cockroach Driver",
     "builtIn": true
   },
-  {
-    "vsCodeId": "mtxr.sqltools-driver-sqlite",
-    "ideaName": "SQLTools SQLite",
-    "builtIn": true
-  },
   {
     "vsCodeId": "octref.vetur",
     "ideaName": "Vue.js",
@@ -504,6 +504,16 @@
     "ideaName": "Meteor",
     "ideaId": "com.jetbrains.plugins.meteor"
   },
+  {
+    "vsCodeId": "waderyan.gitblame",
+    "ideaName": "Git Blame",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "wayou.vscode-todo-highlight",
+    "ideaName": "TODO Highlight",
+    "builtIn": true
+  },
   {
     "vsCodeId": "yzhang.markdown-all-in-one",
     "ideaName": "Markdown",

plugins/ide-startup/importSettings/resources/pluginData/ic.json

@@ -69,11 +69,6 @@
     "ideaName": "Code Runner",
     "builtIn": true
   },
-  {
-    "vsCodeId": "fwcd.kotlin",
-    "ideaName": "Kotlin",
-    "builtIn": true
-  },
   {
     "vsCodeId": "georgewfraser.vscode-javac",
     "ideaName": "Java Language Support",
@@ -86,8 +81,8 @@
   },
   {
     "vsCodeId": "GitLab.gitlab-workflow",
-    "ideaName": "GitLab Workflow",
-    "builtIn": true
+    "ideaName": "GitLab",
+    "ideaId": "org.jetbrains.plugins.gitlab"
   },
   {
     "vsCodeId": "GraphQL.vscode-graphql",
@@ -114,6 +109,11 @@
     "ideaName": "Kotlin Language",
     "builtIn": true
   },
+  {
+    "vsCodeId": "mhutchie.git-graph",
+    "ideaName": "Git Graph",
+    "builtIn": true
+  },
   {
     "vsCodeId": "ms-azuretools.vscode-docker",
     "ideaName": "Docker",
@@ -124,6 +124,16 @@
     "ideaName": "Japanese Language Pack / 日本語言語パック",
     "ideaId": "com.intellij.ja"
   },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-ko",
+    "ideaName": "Korean Language Pack / 한국어 언어 팩",
+    "ideaId": "com.intellij.ko"
+  },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-zh-hans",
+    "ideaName": "Chinese (Simplified) Language Pack / 中文语言包",
+    "ideaId": "com.intellij.zh"
+  },
   {
     "vsCodeId": "ms-python.black-formatter",
     "ideaName": "Python Community Edition",
@@ -234,6 +244,16 @@
     "ideaName": "IdeaVim",
     "ideaId": "IdeaVIM"
   },
+  {
+    "vsCodeId": "waderyan.gitblame",
+    "ideaName": "Git Blame",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "wayou.vscode-todo-highlight",
+    "ideaName": "TODO Highlight",
+    "builtIn": true
+  },
   {
     "vsCodeId": "yzhang.markdown-all-in-one",
     "ideaName": "Markdown",

plugins/ide-startup/importSettings/resources/pluginData/iu.json

@@ -151,8 +151,8 @@
   },
   {
     "vsCodeId": "GitLab.gitlab-workflow",
-    "ideaName": "GitLab Workflow",
-    "builtIn": true
+    "ideaName": "GitLab",
+    "ideaId": "org.jetbrains.plugins.gitlab"
   },
   {
     "vsCodeId": "golang.Go",
@@ -209,6 +209,11 @@
     "ideaName": "Kotlin Language",
     "builtIn": true
   },
+  {
+    "vsCodeId": "mhutchie.git-graph",
+    "ideaName": "Git Graph",
+    "builtIn": true
+  },
   {
     "vsCodeId": "mongodb.mongodb-vscode",
     "ideaName": "Database Tools and SQL",
@@ -229,6 +234,16 @@
     "ideaName": "Japanese Language Pack / 日本語言語パック",
     "ideaId": "com.intellij.ja"
   },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-ko",
+    "ideaName": "Korean Language Pack / 한국어 언어 팩",
+    "ideaId": "com.intellij.ko"
+  },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-zh-hans",
+    "ideaName": "Chinese (Simplified) Language Pack / 中文语言包",
+    "ideaId": "com.intellij.zh"
+  },
   {
     "vsCodeId": "ms-kubernetes-tools.vscode-kubernetes-tools",
     "ideaName": "Kubernetes",
@@ -279,6 +294,11 @@
     "ideaName": "WSL",
     "builtIn": true
   },
+  {
+    "vsCodeId": "ms-vscode.node-debug2",
+    "ideaName": "Node.js",
+    "ideaId": "NodeJS"
+  },
   {
     "vsCodeId": "ms-vscode.vscode-typescript-tslint-plugin",
     "ideaName": "TSLint",
@@ -344,6 +364,11 @@
     "ideaName": "Settings Sync",
     "builtIn": true
   },
+  {
+    "vsCodeId": "Shopify.ruby-lsp",
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
+  },
   {
     "vsCodeId": "streetsidesoftware.code-spell-checker",
     "ideaName": "Grazie Lite",
@@ -444,6 +469,16 @@
     "ideaName": "Vue.js",
     "ideaId": "org.jetbrains.plugins.vue"
   },
+  {
+    "vsCodeId": "waderyan.gitblame",
+    "ideaName": "Git Blame",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "wayou.vscode-todo-highlight",
+    "ideaName": "TODO Highlight",
+    "builtIn": true
+  },
   {
     "vsCodeId": "wholroyd.jinja",
     "ideaName": "Python",

plugins/ide-startup/importSettings/resources/pluginData/pc.json

@@ -4,6 +4,11 @@
     "ideaName": "Terraform and HCL",
     "ideaId": "org.intellij.plugins.hcl"
   },
+  {
+    "vsCodeId": "bungcip.better-toml",
+    "ideaName": "Toml",
+    "ideaId": "org.toml.lang"
+  },
   {
     "vsCodeId": "codezombiech.gitignore",
     "ideaName": "gitignore",
@@ -66,8 +71,8 @@
   },
   {
     "vsCodeId": "GitLab.gitlab-workflow",
-    "ideaName": "GitLab Workflow",
-    "builtIn": true
+    "ideaName": "GitLab",
+    "ideaId": "org.jetbrains.plugins.gitlab"
   },
   {
     "vsCodeId": "GraphQL.vscode-graphql",
@@ -94,6 +99,11 @@
     "ideaName": "Python Test Explorer for Visual Studio Code",
     "builtIn": true
   },
+  {
+    "vsCodeId": "mhutchie.git-graph",
+    "ideaName": "Git Graph",
+    "builtIn": true
+  },
   {
     "vsCodeId": "ms-azuretools.vscode-docker",
     "ideaName": "Docker",
@@ -104,6 +114,11 @@
     "ideaName": "Japanese Language Pack / 日本語言語パック",
     "ideaId": "com.intellij.ja"
   },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-ko",
+    "ideaName": "Korean Language Pack / 한국어 언어 팩",
+    "ideaId": "com.intellij.ko"
+  },
   {
     "vsCodeId": "MS-CEINTL.vscode-language-pack-zh-hans",
     "ideaName": "Chinese (Simplified) Language Pack / 中文语言包",
@@ -121,8 +136,8 @@
   },
   {
     "vsCodeId": "ms-python.python",
-    "ideaName": "Python",
-    "builtIn": true
+    "ideaName": "Python Community Edition",
+    "ideaId": "PythonCore"
   },
   {
     "vsCodeId": "MS-vsliveshare.vsliveshare",
@@ -169,6 +184,16 @@
     "ideaName": "IdeaVim",
     "ideaId": "IdeaVIM"
   },
+  {
+    "vsCodeId": "waderyan.gitblame",
+    "ideaName": "Git Blame",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "wayou.vscode-todo-highlight",
+    "ideaName": "TODO Highlight",
+    "builtIn": true
+  },
   {
     "vsCodeId": "yzhang.markdown-all-in-one",
     "ideaName": "Markdown",

plugins/ide-startup/importSettings/resources/pluginData/pp.json

@@ -29,6 +29,11 @@
     "ideaName": "Python",
     "ideaId": "Pythonid"
   },
+  {
+    "vsCodeId": "bungcip.better-toml",
+    "ideaName": "Toml",
+    "ideaId": "org.toml.lang"
+  },
   {
     "vsCodeId": "codezombiech.gitignore",
     "ideaName": "gitignore",
@@ -126,8 +131,8 @@
   },
   {
     "vsCodeId": "GitLab.gitlab-workflow",
-    "ideaName": "GitLab Workflow",
-    "builtIn": true
+    "ideaName": "GitLab",
+    "ideaId": "org.jetbrains.plugins.gitlab"
   },
   {
     "vsCodeId": "GraphQL.vscode-graphql",
@@ -179,6 +184,11 @@
     "ideaName": "MagicPython",
     "builtIn": true
   },
+  {
+    "vsCodeId": "mhutchie.git-graph",
+    "ideaName": "Git Graph",
+    "builtIn": true
+  },
   {
     "vsCodeId": "mongodb.mongodb-vscode",
     "ideaName": "Database Tools and SQL",
@@ -199,6 +209,11 @@
     "ideaName": "Japanese Language Pack / 日本語言語パック",
     "ideaId": "com.intellij.ja"
   },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-ko",
+    "ideaName": "Korean Language Pack / 한국어 언어 팩",
+    "ideaId": "com.intellij.ko"
+  },
   {
     "vsCodeId": "MS-CEINTL.vscode-language-pack-zh-hans",
     "ideaName": "Chinese (Simplified) Language Pack / 中文语言包",
@@ -254,6 +269,11 @@
     "ideaName": "Remote Development",
     "builtIn": true
   },
+  {
+    "vsCodeId": "ms-vscode.node-debug2",
+    "ideaName": "Node.js",
+    "ideaId": "NodeJS"
+  },
   {
     "vsCodeId": "ms-vscode.vscode-typescript-next",
     "ideaName": "JavaScript and TypeScript Nightly",
@@ -359,6 +379,16 @@
     "ideaName": "IdeaVim",
     "ideaId": "IdeaVIM"
   },
+  {
+    "vsCodeId": "waderyan.gitblame",
+    "ideaName": "Git Blame",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "wayou.vscode-todo-highlight",
+    "ideaName": "TODO Highlight",
+    "builtIn": true
+  },
   {
     "vsCodeId": "wholroyd.jinja",
     "ideaName": "Python",

plugins/ide-startup/importSettings/resources/pluginData/ps.json

@@ -17,7 +17,12 @@
   {
     "vsCodeId": "bmewburn.vscode-intelephense-client",
     "ideaName": "PHP",
-    "builtIn": true
+    "ideaId": "com.jetbrains.php"
+  },
+  {
+    "vsCodeId": "bungcip.better-toml",
+    "ideaName": "Toml",
+    "ideaId": "org.toml.lang"
   },
   {
     "vsCodeId": "cweijan.vscode-mysql-client2",
@@ -32,7 +37,7 @@
   {
     "vsCodeId": "DEVSENSE.phptools-vscode",
     "ideaName": "PHP",
-    "builtIn": true
+    "ideaId": "com.jetbrains.php"
   },
   {
     "vsCodeId": "donjayamanne.githistory",
@@ -49,6 +54,11 @@
     "ideaName": "HTML CSS Support",
     "builtIn": true
   },
+  {
+    "vsCodeId": "EditorConfig.EditorConfig",
+    "ideaName": "EditorConfig",
+    "ideaId": "org.editorconfig.editorconfigjetbrains"
+  },
   {
     "vsCodeId": "emilast.LogFileHighlighter",
     "ideaName": "Ideolog",
@@ -84,6 +94,11 @@
     "ideaName": "GitHub Pull Requests and Issues",
     "builtIn": true
   },
+  {
+    "vsCodeId": "GitLab.gitlab-workflow",
+    "ideaName": "GitLab",
+    "ideaId": "org.jetbrains.plugins.gitlab"
+  },
   {
     "vsCodeId": "GraphQL.vscode-graphql",
     "ideaName": "GraphQL",
@@ -104,6 +119,11 @@
     "ideaName": "phpcs",
     "builtIn": true
   },
+  {
+    "vsCodeId": "mhutchie.git-graph",
+    "ideaName": "Git Graph",
+    "builtIn": true
+  },
   {
     "vsCodeId": "mongodb.mongodb-vscode",
     "ideaName": "Database Tools and SQL",
@@ -124,6 +144,16 @@
     "ideaName": "Japanese Language Pack / 日本語言語パック",
     "ideaId": "com.intellij.ja"
   },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-ko",
+    "ideaName": "Korean Language Pack / 한국어 언어 팩",
+    "ideaId": "com.intellij.ko"
+  },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-zh-hans",
+    "ideaName": "Chinese (Simplified) Language Pack / 中文语言包",
+    "ideaId": "com.intellij.zh"
+  },
   {
     "vsCodeId": "ms-kubernetes-tools.vscode-kubernetes-tools",
     "ideaName": "Kubernetes",
@@ -139,6 +169,11 @@
     "ideaName": "WSL",
     "builtIn": true
   },
+  {
+    "vsCodeId": "ms-vscode.node-debug2",
+    "ideaName": "Node.js",
+    "ideaId": "NodeJS"
+  },
   {
     "vsCodeId": "MS-vsliveshare.vsliveshare",
     "ideaName": "Code With Me",
@@ -189,6 +224,16 @@
     "ideaName": "Svelte",
     "ideaId": "dev.blachut.svelte.lang"
   },
+  {
+    "vsCodeId": "waderyan.gitblame",
+    "ideaName": "Git Blame",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "wayou.vscode-todo-highlight",
+    "ideaName": "TODO Highlight",
+    "builtIn": true
+  },
   {
     "vsCodeId": "xdebug.php-debug",
     "ideaName": "PHP",
@@ -212,6 +257,6 @@
   {
     "vsCodeId": "zobo.php-intellisense",
     "ideaName": "PHP",
-    "builtIn": true
+    "ideaId": "com.jetbrains.php"
   }
 ]

plugins/ide-startup/importSettings/resources/pluginData/rd.json

@@ -39,6 +39,11 @@
     "ideaName": "vscode-database",
     "builtIn": true
   },
+  {
+    "vsCodeId": "bungcip.better-toml",
+    "ideaName": "Toml",
+    "ideaId": "org.toml.lang"
+  },
   {
     "vsCodeId": "christian-kohler.npm-intellisense",
     "ideaName": "npm Intellisense",
@@ -169,6 +174,11 @@
     "ideaName": "GitHub Pull Requests and Issues",
     "builtIn": true
   },
+  {
+    "vsCodeId": "GitLab.gitlab-workflow",
+    "ideaName": "GitLab",
+    "ideaId": "org.jetbrains.plugins.gitlab"
+  },
   {
     "vsCodeId": "GraphQL.vscode-graphql",
     "ideaName": "GraphQL",
@@ -484,6 +494,16 @@
     "ideaName": "Vue.js",
     "ideaId": "org.jetbrains.plugins.vue"
   },
+  {
+    "vsCodeId": "waderyan.gitblame",
+    "ideaName": "Git Blame",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "wayou.vscode-todo-highlight",
+    "ideaName": "TODO Highlight",
+    "builtIn": true
+  },
   {
     "vsCodeId": "YclepticStudios.unity-snippets",
     "ideaName": "Unity Snippets",

plugins/ide-startup/importSettings/resources/pluginData/rm.json

@@ -16,13 +16,13 @@
   },
   {
     "vsCodeId": "aki77.rails-routes",
-    "ideaName": "Rails Routes",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
   },
   {
     "vsCodeId": "aliariff.vscode-erb-beautify",
-    "ideaName": "ERB support",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
   },
   {
     "vsCodeId": "bajdzis.vscode-database",
@@ -31,28 +31,33 @@
   },
   {
     "vsCodeId": "bung87.rails",
-    "ideaName": "Rails support",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
   },
   {
     "vsCodeId": "bung87.vscode-gemfile",
-    "ideaName": "Gemfile support",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
+  },
+  {
+    "vsCodeId": "bungcip.better-toml",
+    "ideaName": "Toml",
+    "ideaId": "org.toml.lang"
   },
   {
     "vsCodeId": "castwide.solargraph",
-    "ideaName": "Ruby support",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
   },
   {
     "vsCodeId": "connorshea.vscode-ruby-test-adapter",
-    "ideaName": "Ruby Test Runner",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
   },
   {
     "vsCodeId": "CraigMaslowski.erb",
-    "ideaName": "ERB support",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
   },
   {
     "vsCodeId": "cweijan.vscode-mysql-client2",
@@ -79,6 +84,11 @@
     "ideaName": "HTML CSS Support",
     "builtIn": true
   },
+  {
+    "vsCodeId": "EditorConfig.EditorConfig",
+    "ideaName": "EditorConfig",
+    "ideaId": "org.editorconfig.editorconfigjetbrains"
+  },
   {
     "vsCodeId": "emilast.LogFileHighlighter",
     "ideaName": "Ideolog",
@@ -116,8 +126,8 @@
   },
   {
     "vsCodeId": "GitLab.gitlab-workflow",
-    "ideaName": "GitLab Workflow",
-    "builtIn": true
+    "ideaName": "GitLab",
+    "ideaId": "org.jetbrains.plugins.gitlab"
   },
   {
     "vsCodeId": "GraphQL.vscode-graphql",
@@ -136,23 +146,28 @@
   },
   {
     "vsCodeId": "kaiwood.endwise",
-    "ideaName": "Ruby support",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
   },
   {
     "vsCodeId": "karunamurti.haml",
-    "ideaName": "HAML support",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
   },
   {
     "vsCodeId": "KoichiSasada.vscode-rdbg",
-    "ideaName": "Ruby Debugger",
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
+  },
+  {
+    "vsCodeId": "mhutchie.git-graph",
+    "ideaName": "Git Graph",
     "builtIn": true
   },
   {
     "vsCodeId": "misogi.ruby-rubocop",
-    "ideaName": "Rubocop support",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
   },
   {
     "vsCodeId": "mongodb.mongodb-vscode",
@@ -174,6 +189,16 @@
     "ideaName": "Japanese Language Pack / 日本語言語パック",
     "ideaId": "com.intellij.ja"
   },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-ko",
+    "ideaName": "Korean Language Pack / 한국어 언어 팩",
+    "ideaId": "com.intellij.ko"
+  },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-zh-hans",
+    "ideaName": "Chinese (Simplified) Language Pack / 中文语言包",
+    "ideaId": "com.intellij.zh"
+  },
   {
     "vsCodeId": "ms-kubernetes-tools.vscode-kubernetes-tools",
     "ideaName": "Kubernetes",
@@ -189,6 +214,11 @@
     "ideaName": "WSL",
     "builtIn": true
   },
+  {
+    "vsCodeId": "ms-vscode.node-debug2",
+    "ideaName": "Node.js",
+    "ideaId": "NodeJS"
+  },
   {
     "vsCodeId": "MS-vsliveshare.vsliveshare",
     "ideaName": "Code With Me",
@@ -201,8 +231,8 @@
   },
   {
     "vsCodeId": "noku.rails-run-spec-vscode",
-    "ideaName": "RSpec support",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
   },
   {
     "vsCodeId": "pranaygp.vscode-css-peek",
@@ -216,23 +246,23 @@
   },
   {
     "vsCodeId": "Shopify.ruby-lsp",
-    "ideaName": "Ruby support",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
   },
   {
     "vsCodeId": "Shopify.theme-check-vscode",
-    "ideaName": "Liquid support",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
   },
   {
     "vsCodeId": "sianglim.slim",
-    "ideaName": "Slim support",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
   },
   {
     "vsCodeId": "sorbet.sorbet-vscode-extension",
-    "ideaName": "Ruby Sorbet support",
-    "builtIn": true
+    "ideaName": "Ruby",
+    "ideaId": "org.jetbrains.plugins.ruby"
   },
   {
     "vsCodeId": "streetsidesoftware.code-spell-checker",
@@ -249,6 +279,16 @@
     "ideaName": "Open in browser",
     "builtIn": true
   },
+  {
+    "vsCodeId": "waderyan.gitblame",
+    "ideaName": "Git Blame",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "wayou.vscode-todo-highlight",
+    "ideaName": "TODO Highlight",
+    "builtIn": true
+  },
   {
     "vsCodeId": "yzhang.markdown-all-in-one",
     "ideaName": "Markdown",

plugins/ide-startup/importSettings/resources/pluginData/rr.json

@@ -14,6 +14,11 @@
     "ideaName": "vscode-database",
     "builtIn": true
   },
+  {
+    "vsCodeId": "bungcip.better-toml",
+    "ideaName": "Toml",
+    "ideaId": "org.toml.lang"
+  },
   {
     "vsCodeId": "cweijan.vscode-mysql-client2",
     "ideaName": "Database Tools and SQL",
@@ -64,6 +69,11 @@
     "ideaName": "GitHub Pull Requests and Issues",
     "builtIn": true
   },
+  {
+    "vsCodeId": "GitLab.gitlab-workflow",
+    "ideaName": "GitLab",
+    "ideaId": "org.jetbrains.plugins.gitlab"
+  },
   {
     "vsCodeId": "GraphQL.vscode-graphql",
     "ideaName": "GraphQL",
@@ -79,6 +89,11 @@
     "ideaName": "Terraform and HCL",
     "ideaId": "org.intellij.plugins.hcl"
   },
+  {
+    "vsCodeId": "mhutchie.git-graph",
+    "ideaName": "Git Graph",
+    "builtIn": true
+  },
   {
     "vsCodeId": "mongodb.mongodb-vscode",
     "ideaName": "Database Tools and SQL",
@@ -99,6 +114,16 @@
     "ideaName": "Japanese Language Pack / 日本語言語パック",
     "ideaId": "com.intellij.ja"
   },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-ko",
+    "ideaName": "Korean Language Pack / 한국어 언어 팩",
+    "ideaId": "com.intellij.ko"
+  },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-zh-hans",
+    "ideaName": "Chinese (Simplified) Language Pack / 中文语言包",
+    "ideaId": "com.intellij.zh"
+  },
   {
     "vsCodeId": "ms-kubernetes-tools.vscode-kubernetes-tools",
     "ideaName": "Kubernetes",
@@ -114,6 +139,11 @@
     "ideaName": "WSL",
     "builtIn": true
   },
+  {
+    "vsCodeId": "ms-vscode.node-debug2",
+    "ideaName": "Node.js",
+    "ideaId": "NodeJS"
+  },
   {
     "vsCodeId": "MS-vsliveshare.vsliveshare",
     "ideaName": "Code With Me",
@@ -136,14 +166,24 @@
   },
   {
     "vsCodeId": "rust-lang.rust-analyzer",
-    "ideaName": "Rust Support",
-    "builtIn": true
+    "ideaName": "Rust",
+    "ideaId": "com.jetbrains.rust"
   },
   {
     "vsCodeId": "streetsidesoftware.code-spell-checker",
     "ideaName": "Grazie Lite",
     "ideaId": "tanvd.grazi"
   },
+  {
+    "vsCodeId": "waderyan.gitblame",
+    "ideaName": "Git Blame",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "wayou.vscode-todo-highlight",
+    "ideaName": "TODO Highlight",
+    "builtIn": true
+  },
   {
     "vsCodeId": "Zignd.html-css-class-completion",
     "ideaName": "CSS",

plugins/ide-startup/importSettings/resources/pluginData/ws.json

@@ -19,6 +19,11 @@
     "ideaName": "Tailwind CSS",
     "ideaId": "com.intellij.tailwindcss"
   },
+  {
+    "vsCodeId": "bungcip.better-toml",
+    "ideaName": "Toml",
+    "ideaId": "org.toml.lang"
+  },
   {
     "vsCodeId": "christian-kohler.npm-intellisense",
     "ideaName": "npm Intellisense",
@@ -54,6 +59,11 @@
     "ideaName": "HTML CSS Support",
     "builtIn": true
   },
+  {
+    "vsCodeId": "EditorConfig.EditorConfig",
+    "ideaName": "EditorConfig",
+    "ideaId": "org.editorconfig.editorconfigjetbrains"
+  },
   {
     "vsCodeId": "eg2.vscode-npm-script",
     "ideaName": "npm",
@@ -96,8 +106,8 @@
   },
   {
     "vsCodeId": "GitLab.gitlab-workflow",
-    "ideaName": "GitLab Workflow",
-    "builtIn": true
+    "ideaName": "GitLab",
+    "ideaId": "org.jetbrains.plugins.gitlab"
   },
   {
     "vsCodeId": "GraphQL.vscode-graphql",
@@ -129,6 +139,11 @@
     "ideaName": "Angular",
     "ideaId": "AngularJS"
   },
+  {
+    "vsCodeId": "mhutchie.git-graph",
+    "ideaName": "Git Graph",
+    "builtIn": true
+  },
   {
     "vsCodeId": "mongodb.mongodb-vscode",
     "ideaName": "Database Tools and SQL for WebStorm",
@@ -149,6 +164,11 @@
     "ideaName": "Japanese Language Pack / 日本語言語パック",
     "ideaId": "com.intellij.ja"
   },
+  {
+    "vsCodeId": "MS-CEINTL.vscode-language-pack-ko",
+    "ideaName": "Korean Language Pack / 한국어 언어 팩",
+    "ideaId": "com.intellij.ko"
+  },
   {
     "vsCodeId": "MS-CEINTL.vscode-language-pack-zh-hans",
     "ideaName": "Chinese (Simplified) Language Pack / 中文语言包",
@@ -184,6 +204,11 @@
     "ideaName": "Remote Development",
     "builtIn": true
   },
+  {
+    "vsCodeId": "ms-vscode.node-debug2",
+    "ideaName": "Node.js",
+    "ideaId": "NodeJS"
+  },
   {
     "vsCodeId": "ms-vscode.vscode-typescript-tslint-plugin",
     "ideaName": "TSLint",
@@ -267,6 +292,16 @@
   {
     "vsCodeId": "Vue.volar",
     "ideaName": "Vue.js",
+    "ideaId": "org.jetbrains.plugins.vue"
+  },
+  {
+    "vsCodeId": "waderyan.gitblame",
+    "ideaName": "Git Blame",
+    "builtIn": true
+  },
+  {
+    "vsCodeId": "wayou.vscode-todo-highlight",
+    "ideaName": "TODO Highlight",
     "builtIn": true
   },
   {

plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vscode/mappings/PluginMappings.kt

@@ -48,24 +48,24 @@ internal class CommonPluginMapping : VSCodePluginMapping {
   // Note that the later files will override the data from the former.
   @Suppress("DEPRECATION")
   private fun getResourceMappings(): List<String> = when {
-    PlatformUtils.isAqua() -> listOf("general.json", "aq.json")
-    PlatformUtils.isCLion() -> listOf("general.json", "cl.json")
-    PlatformUtils.isDataGrip() -> listOf("general.json", "dg.json")
-    PlatformUtils.isDataSpell() -> listOf("general.json", "ds.json")
-    PlatformUtils.isGoIde() -> listOf("general.json", "go.json")
-    PlatformUtils.isPhpStorm() -> listOf("general.json", "ps.json")
-    PlatformUtils.isRider() -> listOf("general.json", "rd.json")
-    PlatformUtils.isRubyMine() -> listOf("general.json", "rm.json")
-    PlatformUtils.isRustRover() -> listOf("general.json", "rr.json")
-    PlatformUtils.isWebStorm() -> listOf("general.json", "ws.json")
+    PlatformUtils.isAqua() -> listOf("aq.json")
+    PlatformUtils.isCLion() -> listOf("cl.json")
+    PlatformUtils.isDataGrip() -> listOf("dg.json")
+    PlatformUtils.isDataSpell() -> listOf("ds.json")
+    PlatformUtils.isGoIde() -> listOf("go.json")
+    PlatformUtils.isPhpStorm() -> listOf("ps.json")
+    PlatformUtils.isRider() -> listOf("rd.json")
+    PlatformUtils.isRubyMine() -> listOf("rm.json")
+    PlatformUtils.isRustRover() -> listOf("rr.json")
+    PlatformUtils.isWebStorm() -> listOf("ws.json")
 
     // NOTE: order is important in this subsection
-    PlatformUtils.isIdeaUltimate() -> listOf("general.json", "ic.json", "iu.json")
-    PlatformUtils.isIntelliJ() -> listOf("general.json", "ic.json")
-    PlatformUtils.isPyCharmPro() -> listOf("general.json", "pc.json", "pp.json")
-    PlatformUtils.isPyCharm() -> listOf("general.json", "pc.json")
+    PlatformUtils.isIdeaUltimate() -> listOf("ic.json", "iu.json")
+    PlatformUtils.isIntelliJ() -> listOf("ic.json")
+    PlatformUtils.isPyCharmPro() -> listOf("pc.json", "pp.json")
+    PlatformUtils.isPyCharm() -> listOf("pc.json")
 
-    else -> listOf("general.json")
+    else -> listOf()
   }
 
   private val allPlugins by lazy {