From f0b627a002f3f5b580558c6c5b6e43f1ccf30282 Mon Sep 17 00:00:00 2001 From: Bogdan Kirilenko Date: Wed, 6 Mar 2024 19:31:41 +0100 Subject: [PATCH] [pycharm] PY-70541 hotfix for HF card icons: those from AllIcons pack GitOrigin-RevId: 17d442f232310896850e0e6d18dd35d5bb8c4f3d --- ...llij.python.community.impl.huggingFace.iml | 1 - .../resources/HuggingFaceIconMappings.json | 19 +++++++++++++++ .../impl/huggingFace}/icons/download.svg | 0 .../impl/huggingFace}/icons/like.svg | 0 .../impl/huggingFace}/icons/logo.svg | 0 ...llij.python.community.impl.huggingFace.xml | 1 + .../documentation/HuggingFaceHtmlBuilder.kt | 23 +++++++++++-------- .../PythonCommunityImplHuggingFaceIcons.java | 8 +++---- 8 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 python/huggingFace/resources/HuggingFaceIconMappings.json rename python/huggingFace/resources/{ => com/intellij/python/community/impl/huggingFace}/icons/download.svg (100%) rename python/huggingFace/resources/{ => com/intellij/python/community/impl/huggingFace}/icons/like.svg (100%) rename python/huggingFace/resources/{ => com/intellij/python/community/impl/huggingFace}/icons/logo.svg (100%) rename python/huggingFace/{gen/com/intellij/python/community/impl/huggingFace => src/com/intellij/python/community/impl/huggingFace/icons}/PythonCommunityImplHuggingFaceIcons.java (61%) diff --git a/python/huggingFace/intellij.python.community.impl.huggingFace.iml b/python/huggingFace/intellij.python.community.impl.huggingFace.iml index 11b1b99df86e..a8f7a3650701 100644 --- a/python/huggingFace/intellij.python.community.impl.huggingFace.iml +++ b/python/huggingFace/intellij.python.community.impl.huggingFace.iml @@ -5,7 +5,6 @@ - diff --git a/python/huggingFace/resources/HuggingFaceIconMappings.json b/python/huggingFace/resources/HuggingFaceIconMappings.json new file mode 100644 index 000000000000..02d74f1eb261 --- /dev/null +++ b/python/huggingFace/resources/HuggingFaceIconMappings.json @@ -0,0 +1,19 @@ +{ + "com": { + "intellij": { + "python": { + "community": { + "impl": { + "huggingFace": { + "icons": { + "download.svg": "com/intellij/python/community/impl/huggingFace/icons/download.svg", + "like.svg": "com/intellij/python/community/impl/huggingFace/icons/like.svg", + "logo.svg": "com/intellij/python/community/impl/huggingFace/icons/logo.svg" + } + } + } + } + } + } + } +} diff --git a/python/huggingFace/resources/icons/download.svg b/python/huggingFace/resources/com/intellij/python/community/impl/huggingFace/icons/download.svg similarity index 100% rename from python/huggingFace/resources/icons/download.svg rename to python/huggingFace/resources/com/intellij/python/community/impl/huggingFace/icons/download.svg diff --git a/python/huggingFace/resources/icons/like.svg b/python/huggingFace/resources/com/intellij/python/community/impl/huggingFace/icons/like.svg similarity index 100% rename from python/huggingFace/resources/icons/like.svg rename to python/huggingFace/resources/com/intellij/python/community/impl/huggingFace/icons/like.svg diff --git a/python/huggingFace/resources/icons/logo.svg b/python/huggingFace/resources/com/intellij/python/community/impl/huggingFace/icons/logo.svg similarity index 100% rename from python/huggingFace/resources/icons/logo.svg rename to python/huggingFace/resources/com/intellij/python/community/impl/huggingFace/icons/logo.svg diff --git a/python/huggingFace/resources/intellij.python.community.impl.huggingFace.xml b/python/huggingFace/resources/intellij.python.community.impl.huggingFace.xml index 3a532d034cc3..3a9af524e062 100644 --- a/python/huggingFace/resources/intellij.python.community.impl.huggingFace.xml +++ b/python/huggingFace/resources/intellij.python.community.impl.huggingFace.xml @@ -12,5 +12,6 @@ implementation="com.intellij.python.community.impl.huggingFace.documentation.HuggingFaceDocumentationTargetProvider"/> + \ No newline at end of file diff --git a/python/huggingFace/src/com/intellij/python/community/impl/huggingFace/documentation/HuggingFaceHtmlBuilder.kt b/python/huggingFace/src/com/intellij/python/community/impl/huggingFace/documentation/HuggingFaceHtmlBuilder.kt index dac7df29b849..a7de9a36bee8 100644 --- a/python/huggingFace/src/com/intellij/python/community/impl/huggingFace/documentation/HuggingFaceHtmlBuilder.kt +++ b/python/huggingFace/src/com/intellij/python/community/impl/huggingFace/documentation/HuggingFaceHtmlBuilder.kt @@ -12,12 +12,6 @@ import com.intellij.python.community.impl.huggingFace.api.HuggingFaceURLProvider import com.intellij.python.community.impl.huggingFace.documentation.HuggingFaceQuickDocStyles.LINK_TOP_MARGIN import com.intellij.python.community.impl.huggingFace.service.PyHuggingFaceBundle -private val DOWNLOADS_ICON = HtmlChunk.tag("icon") - .attr("src", "icons/download.svg") -private val LIKES_ICON = HtmlChunk.tag("icon") - .attr(".src", "icons/like.svg") -private val LOGO_ICON = HtmlChunk.tag("icon") - .attr(".src", "icons/logo.svg") class HuggingFaceHtmlBuilder( private val project: Project, @@ -52,8 +46,8 @@ class HuggingFaceHtmlBuilder( val modelNameWithIconRow = HtmlChunk.tag("h3") .children( HtmlChunk.raw(cardTitle), - HtmlChunk.nbsp(2), - LOGO_ICON + // HtmlChunk.nbsp(2), + // LOGO_ICON ) // modelPurpose chunk is not applicable for datasets @@ -91,8 +85,6 @@ class HuggingFaceHtmlBuilder( .wrapWith("p") .style("margin-top: ${LINK_TOP_MARGIN}px;") // compensate h3 tag bottom margin - - val headerContainer = HtmlChunk.div() .setClass(DocumentationMarkup.CLASS_DEFINITION) .children( @@ -102,4 +94,15 @@ class HuggingFaceHtmlBuilder( ) return headerContainer } + + companion object { + private val DOWNLOADS_ICON = HtmlChunk.tag("icon") + // .attr("src", "com.intellij.python.community.impl.huggingFace.icons.PythonCommunityImplHuggingFaceIcons.Download") + .attr("src", "AllIcons.Actions.Download") + private val LIKES_ICON = HtmlChunk.tag("icon") + // .attr(".src", "com.intellij.python.community.impl.huggingFace.icons.PythonCommunityImplHuggingFaceIcons.Like") + .attr(".src", "AllIcons.Toolwindows.ToolWindowFavorites") + //private val LOGO_ICON = HtmlChunk.tag("icon") + // .attr(".src", "/com/intellij/python/community/impl/huggingFace/icons/logo.svg") + } } diff --git a/python/huggingFace/gen/com/intellij/python/community/impl/huggingFace/PythonCommunityImplHuggingFaceIcons.java b/python/huggingFace/src/com/intellij/python/community/impl/huggingFace/icons/PythonCommunityImplHuggingFaceIcons.java similarity index 61% rename from python/huggingFace/gen/com/intellij/python/community/impl/huggingFace/PythonCommunityImplHuggingFaceIcons.java rename to python/huggingFace/src/com/intellij/python/community/impl/huggingFace/icons/PythonCommunityImplHuggingFaceIcons.java index db962e9acdff..82e9fe5a385a 100644 --- a/python/huggingFace/gen/com/intellij/python/community/impl/huggingFace/PythonCommunityImplHuggingFaceIcons.java +++ b/python/huggingFace/src/com/intellij/python/community/impl/huggingFace/icons/PythonCommunityImplHuggingFaceIcons.java @@ -1,5 +1,5 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.python.community.impl.huggingFace; +package com.intellij.python.community.impl.huggingFace.icons; import com.intellij.ui.IconManager; import org.jetbrains.annotations.NotNull; @@ -14,7 +14,7 @@ public final class PythonCommunityImplHuggingFaceIcons { private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) { return IconManager.getInstance().loadRasterizedIcon(path, PythonCommunityImplHuggingFaceIcons.class.getClassLoader(), cacheKey, flags); } - /** 14x14 */ public static final @NotNull Icon Download = load("icons/download.svg", -459821553, 0); - /** 14x14 */ public static final @NotNull Icon Like = load("icons/like.svg", -1702501286, 0); - /** 16x16 */ public static final @NotNull Icon Logo = load("icons/logo.svg", 59143455, 0); + /** 14x14 */ public static final @NotNull Icon Download = load("com/intellij/python/community/impl/huggingFace/icons/download.svg", -459821553, 0); + /** 14x14 */ public static final @NotNull Icon Like = load("com/intellij/python/community/impl/huggingFace/icons/like.svg", -1702501286, 0); + /** 16x16 */ public static final @NotNull Icon Logo = load("com/intellij/python/community/impl/huggingFace/icons/logo.svg", 59143455, 0); }