From 419a9628ee36917403f342f3e598692600872ad0 Mon Sep 17 00:00:00 2001 From: Piotr Tomiak Date: Mon, 13 May 2024 16:05:47 +0200 Subject: [PATCH] Web Symbols: remove unsupported `script-urls-patterns` property GitOrigin-RevId: 02c64bf5e4958a7502b517f0ea3ad5abd7acc0ec --- platform/webSymbols/api-dump-unreviewed.txt | 8 +++--- .../webTypes/json/EnablementRules.java | 26 ------------------- .../context/WebSymbolsContextKindRules.kt | 3 +-- .../webTypes/json/WebTypesJsonUtils.kt | 3 +-- .../web-types-gen/resources/web-types.json | 7 ----- 5 files changed, 5 insertions(+), 42 deletions(-) diff --git a/platform/webSymbols/api-dump-unreviewed.txt b/platform/webSymbols/api-dump-unreviewed.txt index 173becb84ba2..e1a7b92b0aae 100644 --- a/platform/webSymbols/api-dump-unreviewed.txt +++ b/platform/webSymbols/api-dump-unreviewed.txt @@ -448,22 +448,20 @@ - hashCode():I - toString():java.lang.String *f:com.intellij.webSymbols.context.WebSymbolsContextKindRules$EnablementRules -- (java.util.Map,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List):V +- (java.util.Map,java.util.List,java.util.List,java.util.List,java.util.List):V - f:component1():java.util.Map - f:component2():java.util.List - f:component3():java.util.List - f:component4():java.util.List - f:component5():java.util.List -- f:component6():java.util.List -- f:copy(java.util.Map,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List):com.intellij.webSymbols.context.WebSymbolsContextKindRules$EnablementRules -- bs:copy$default(com.intellij.webSymbols.context.WebSymbolsContextKindRules$EnablementRules,java.util.Map,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,I,java.lang.Object):com.intellij.webSymbols.context.WebSymbolsContextKindRules$EnablementRules +- f:copy(java.util.Map,java.util.List,java.util.List,java.util.List,java.util.List):com.intellij.webSymbols.context.WebSymbolsContextKindRules$EnablementRules +- bs:copy$default(com.intellij.webSymbols.context.WebSymbolsContextKindRules$EnablementRules,java.util.Map,java.util.List,java.util.List,java.util.List,java.util.List,I,java.lang.Object):com.intellij.webSymbols.context.WebSymbolsContextKindRules$EnablementRules - equals(java.lang.Object):Z - f:getFileExtensions():java.util.List - f:getFileNamePatterns():java.util.List - f:getIdeLibraries():java.util.List - f:getPkgManagerDependencies():java.util.Map - f:getProjectToolExecutables():java.util.List -- f:getScriptUrlPatterns():java.util.List - hashCode():I - toString():java.lang.String *:com.intellij.webSymbols.context.WebSymbolsContextProvider diff --git a/platform/webSymbols/gen/com/intellij/webSymbols/webTypes/json/EnablementRules.java b/platform/webSymbols/gen/com/intellij/webSymbols/webTypes/json/EnablementRules.java index 0ba3738519db..6fde43e94499 100644 --- a/platform/webSymbols/gen/com/intellij/webSymbols/webTypes/json/EnablementRules.java +++ b/platform/webSymbols/gen/com/intellij/webSymbols/webTypes/json/EnablementRules.java @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonPropertyOrder({ "node-packages", "ruby-gems", - "script-url-patterns", "file-extensions", "file-name-patterns", "ide-libraries", @@ -44,13 +43,6 @@ public class EnablementRules { @JsonProperty("ruby-gems") @JsonPropertyDescription("Ruby gem names, which enable framework support within the particular Ruby module.") private List rubyGems = new ArrayList(); - /** - * RegExps to match script URLs, which enable framework support within a particular HTML. - * - */ - @JsonProperty("script-url-patterns") - @JsonPropertyDescription("RegExps to match script URLs, which enable framework support within a particular HTML.") - private List scriptUrlPatterns = new ArrayList(); /** * Extensions of files, which should have the framework support enabled. Use this to support custom file extensions like '.vue' or '.svelte'. Never specify generic extensions like '.html', '.js' or '.ts'. If you need your contributions to be present in every file don't specify the framework at all * @@ -118,24 +110,6 @@ public class EnablementRules { this.rubyGems = rubyGems; } - /** - * RegExps to match script URLs, which enable framework support within a particular HTML. - * - */ - @JsonProperty("script-url-patterns") - public List getScriptUrlPatterns() { - return scriptUrlPatterns; - } - - /** - * RegExps to match script URLs, which enable framework support within a particular HTML. - * - */ - @JsonProperty("script-url-patterns") - public void setScriptUrlPatterns(List scriptUrlPatterns) { - this.scriptUrlPatterns = scriptUrlPatterns; - } - /** * Extensions of files, which should have the framework support enabled. Use this to support custom file extensions like '.vue' or '.svelte'. Never specify generic extensions like '.html', '.js' or '.ts'. If you need your contributions to be present in every file don't specify the framework at all * diff --git a/platform/webSymbols/src/com/intellij/webSymbols/context/WebSymbolsContextKindRules.kt b/platform/webSymbols/src/com/intellij/webSymbols/context/WebSymbolsContextKindRules.kt index eac712eb0565..a3d7fb829c9b 100644 --- a/platform/webSymbols/src/com/intellij/webSymbols/context/WebSymbolsContextKindRules.kt +++ b/platform/webSymbols/src/com/intellij/webSymbols/context/WebSymbolsContextKindRules.kt @@ -16,8 +16,7 @@ interface WebSymbolsContextKindRules { val projectToolExecutables: List, val fileExtensions: List, val ideLibraries: List, - val fileNamePatterns: List, - val scriptUrlPatterns: List) + val fileNamePatterns: List) companion object { diff --git a/platform/webSymbols/src/com/intellij/webSymbols/webTypes/json/WebTypesJsonUtils.kt b/platform/webSymbols/src/com/intellij/webSymbols/webTypes/json/WebTypesJsonUtils.kt index 057c08eb8574..29ab5394a7ab 100644 --- a/platform/webSymbols/src/com/intellij/webSymbols/webTypes/json/WebTypesJsonUtils.kt +++ b/platform/webSymbols/src/com/intellij/webSymbols/webTypes/json/WebTypesJsonUtils.kt @@ -285,8 +285,7 @@ internal fun EnablementRules.wrap(): WebSymbolsContextKindRules.EnablementRules projectToolExecutables, fileExtensions, ideLibraries, - fileNamePatterns.mapNotNull { it.toRegex() }, - scriptUrlPatterns.mapNotNull { it.toRegex() } + fileNamePatterns.mapNotNull { it.toRegex() } ) internal fun DisablementRules.wrap(): WebSymbolsContextKindRules.DisablementRules = diff --git a/platform/webSymbols/web-types-gen/resources/web-types.json b/platform/webSymbols/web-types-gen/resources/web-types.json index f1005f0038c2..8910f937d41e 100644 --- a/platform/webSymbols/web-types-gen/resources/web-types.json +++ b/platform/webSymbols/web-types-gen/resources/web-types.json @@ -230,13 +230,6 @@ "type": "string" } }, - "script-url-patterns": { - "description": "RegExps to match script URLs, which enable framework support within a particular HTML.", - "type": "array", - "items": { - "$ref": "#/definitions/pattern" - } - }, "file-extensions": { "description": "Extensions of files, which should have the framework support enabled. Use this to support custom file extensions like '.vue' or '.svelte'. Never specify generic extensions like '.html', '.js' or '.ts'. If you need your contributions to be present in every file don't specify the framework at all", "type": "array",