Skip to content

Commit

Permalink
chore: Support Jetbrains IDEs 243 - temporarily disable BlazeTypeScri…
Browse files Browse the repository at this point in the history
…ptConfigLibraryUpdater for 243
  • Loading branch information
tpasternak committed Sep 25, 2024
1 parent 2ae67dd commit 2c9e91f
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 11 deletions.
23 changes: 17 additions & 6 deletions javascript/BUILD
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
load(
"//:build-visibility.bzl",
"JAVASCRIPT_PACKAGES_VISIBILITY",
"PLUGIN_PACKAGES_VISIBILITY",
)
load(
"//build_defs:build_defs.bzl",
"intellij_plugin",
"intellij_plugin_library",
"optional_plugin_xml",
"stamped_plugin_xml",
)
load("//intellij_platform_sdk:build_defs.bzl", "select_for_plugin_api")
load(
"//testing:test_defs.bzl",
"intellij_integration_test_suite",
"intellij_unit_test_suite",
)
load(
"//:build-visibility.bzl",
"JAVASCRIPT_PACKAGES_VISIBILITY",
"PLUGIN_PACKAGES_VISIBILITY",
)

licenses(["notice"])

Expand All @@ -39,9 +40,19 @@ optional_plugin_xml(
plugin_xml = "src/META-INF/javascript-contents.xml",
)

optional_plugin_xml(
name = "optional_xml_243",
module = ["JavaScript"],
plugin_xml = "src/META-INF/javascript-contents-243.xml",
)

intellij_plugin_library(
name = "plugin_library",
optional_plugin_xmls = [":optional_xml"],
optional_plugin_xmls = [":optional_xml"] + select_for_plugin_api({
"intellij-2024.3": [],
"intellij-ue-2024.3": [],
"default": [":optional_xml_243"],
}),
plugin_xmls = ["src/META-INF/blaze-javascript.xml"],
visibility = PLUGIN_PACKAGES_VISIBILITY,
deps = [":javascript"],
Expand Down
23 changes: 23 additions & 0 deletions javascript/src/META-INF/javascript-contents-243.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!--
~ Copyright 2024 The Bazel Authors. All rights reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<idea-plugin>
<extensions defaultExtensionNs="com.intellij">
<projectService
serviceInterface="com.intellij.lang.typescript.tsconfig.TypeScriptConfigLibraryUpdater"
serviceImplementation="com.google.idea.blaze.typescript.BlazeTypeScriptConfigLibraryUpdater"
overrides="true"/>
</extensions>
</idea-plugin>
6 changes: 1 addition & 5 deletions javascript/src/META-INF/javascript-contents.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
~ Copyright 2018 The Bazel Authors. All rights reserved.
~ Copyright 2024 The Bazel Authors. All rights reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -22,10 +22,6 @@
order="first"/>
<additionalLibraryRootsProvider
implementation="com.google.idea.blaze.typescript.BlazeTypeScriptAdditionalLibraryRootsProvider"/>
<projectService
serviceInterface="com.intellij.lang.typescript.tsconfig.TypeScriptConfigLibraryUpdater"
serviceImplementation="com.google.idea.blaze.typescript.BlazeTypeScriptConfigLibraryUpdater"
overrides="true"/>
<projectService
serviceInterface="com.intellij.lang.typescript.tsconfig.TypeScriptConfigService"
serviceImplementation="com.google.idea.blaze.typescript.DelegatingTypeScriptConfigService"
Expand Down

0 comments on commit 2c9e91f

Please sign in to comment.