The Unified and Autonomous Development Platform
Fix syntax highlight bug
Robin Shendeaf3db96b14
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceLocator.java b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceLocator.javadeleted file mode 100644index 048cba6402..0000000000--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceLocator.java+++ /dev/null@@ -1,5 +0,0 @@-package io.onedev.server.web.asset.codemirror;--public class CodeMirrorResourceLocator {--}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.javaindex e3a8556afd..44b5b7ba3a 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java@@ -19,88 +19,89 @@ public class CodeMirrorResourceReference extends BaseDependentResourceReferenceprivate static final long serialVersionUID = 1L;public CodeMirrorResourceReference() {- super(CodeMirrorResourceLocator.class, "codemirror-integration.js");+ super(CodeMirrorResourceReference.class, "codemirror-integration.js");}@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "lib/codemirror.js")));+ CodeMirrorResourceReference.class, "lib/codemirror.js")));+ dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(+ CodeMirrorResourceReference.class, "addon/runmode/runmode.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/mode/overlay.js")));+ CodeMirrorResourceReference.class, "addon/mode/overlay.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/mode/simple.js")));+ CodeMirrorResourceReference.class, "addon/mode/simple.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/mode/multiplex.js")));+ CodeMirrorResourceReference.class, "addon/mode/multiplex.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/edit/matchbrackets.js")));+ CodeMirrorResourceReference.class, "addon/edit/matchbrackets.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/dialog/dialog.js")));+ CodeMirrorResourceReference.class, "addon/dialog/dialog.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/fold/foldcode.js")));+ CodeMirrorResourceReference.class, "addon/fold/foldcode.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/fold/foldgutter.js")));+ CodeMirrorResourceReference.class, "addon/fold/foldgutter.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/fold/brace-fold.js")));+ CodeMirrorResourceReference.class, "addon/fold/brace-fold.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/fold/xml-fold.js")));+ CodeMirrorResourceReference.class, "addon/fold/xml-fold.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/fold/markdown-fold.js")));+ CodeMirrorResourceReference.class, "addon/fold/markdown-fold.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/fold/comment-fold.js")));+ CodeMirrorResourceReference.class, "addon/fold/comment-fold.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/search/searchcursor.js")));+ CodeMirrorResourceReference.class, "addon/search/searchcursor.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/search/search.js")));+ CodeMirrorResourceReference.class, "addon/search/search.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/search/matchesonscrollbar.js")));+ CodeMirrorResourceReference.class, "addon/search/matchesonscrollbar.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(- CodeMirrorResourceLocator.class, "matchesonscrollbar2.js")));+ CodeMirrorResourceReference.class, "matchesonscrollbar2.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/selection/active-line.js")));+ CodeMirrorResourceReference.class, "addon/selection/active-line.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/scroll/annotatescrollbar.js")));+ CodeMirrorResourceReference.class, "addon/scroll/annotatescrollbar.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/display/fullscreen.js")));+ CodeMirrorResourceReference.class, "addon/display/fullscreen.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/selection/mark-selection.js")));+ CodeMirrorResourceReference.class, "addon/selection/mark-selection.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/hint/show-hint.js")));+ CodeMirrorResourceReference.class, "addon/hint/show-hint.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(- CodeMirrorResourceLocator.class, "annotatescrollbar2.js")));+ CodeMirrorResourceReference.class, "annotatescrollbar2.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(- CodeMirrorResourceLocator.class, "simplescrollbars.js")));+ CodeMirrorResourceReference.class, "simplescrollbars.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(- CodeMirrorResourceLocator.class, "gotoline.js")));+ CodeMirrorResourceReference.class, "gotoline.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(- CodeMirrorResourceLocator.class, "identifier-highlighter.js")));+ CodeMirrorResourceReference.class, "identifier-highlighter.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(- CodeMirrorResourceLocator.class, "addon/mode/loadmode.js")));+ CodeMirrorResourceReference.class, "addon/mode/loadmode.js")));dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "mode/meta.js")));- dependencies.add(JavaScriptHeaderItem.forReference(new ModeUrlResourceReference()));-+ CodeMirrorResourceReference.class, "mode/meta.js")));dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));dependencies.add(CssHeaderItem.forReference(new CssResourceReference(- CodeMirrorResourceLocator.class, "lib/codemirror.css")));- dependencies.add(CssHeaderItem.forReference(new CodeThemeCssResourceReference()));+ CodeMirrorResourceReference.class, "lib/codemirror.css")));+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(+ CodeMirrorResourceReference.class, "addon/dialog/dialog.css")));dependencies.add(CssHeaderItem.forReference(new CssResourceReference(- CodeMirrorResourceLocator.class, "addon/dialog/dialog.css")));+ CodeMirrorResourceReference.class, "addon/fold/foldgutter.css")));dependencies.add(CssHeaderItem.forReference(new CssResourceReference(- CodeMirrorResourceLocator.class, "addon/fold/foldgutter.css")));+ CodeMirrorResourceReference.class, "addon/scroll/simplescrollbars.css")));dependencies.add(CssHeaderItem.forReference(new CssResourceReference(- CodeMirrorResourceLocator.class, "addon/scroll/simplescrollbars.css")));+ CodeMirrorResourceReference.class, "addon/search/matchesonscrollbar.css")));dependencies.add(CssHeaderItem.forReference(new CssResourceReference(- CodeMirrorResourceLocator.class, "addon/search/matchesonscrollbar.css")));+ CodeMirrorResourceReference.class, "addon/display/fullscreen.css")));dependencies.add(CssHeaderItem.forReference(new CssResourceReference(- CodeMirrorResourceLocator.class, "addon/display/fullscreen.css")));+ CodeMirrorResourceReference.class, "addon/hint/show-hint.css")));dependencies.add(CssHeaderItem.forReference(new CssResourceReference(- CodeMirrorResourceLocator.class, "addon/hint/show-hint.css")));+ CodeMirrorResourceReference.class, "theme/eclipse.css")));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(- CodeMirrorResourceLocator.class, "codemirror-custom.css")));-+ CodeMirrorResourceReference.class, "codemirror-custom.css")));+return dependencies;}}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeThemeCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeThemeCssResourceReference.javadeleted file mode 100644index 30e06c16fa..0000000000--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeThemeCssResourceReference.java+++ /dev/null@@ -1,32 +0,0 @@-package io.onedev.server.web.asset.codemirror;--import java.util.List;--import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.HeaderItem;-import org.apache.wicket.request.resource.CssResourceReference;--public class CodeThemeCssResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public CodeThemeCssResourceReference() {- // must use CodeMirrorResourceLocator.class as resource scope to- // make sure it is only loaded once- super(CodeMirrorResourceLocator.class, "theme-custom.css");- }-- @Override- public List<HeaderItem> getDependencies() {- List<HeaderItem> dependencies = super.getDependencies();-- // must use CodeMirrorResourceLocator.class as resource scope to- // make sure it is only loaded once- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(- CodeMirrorResourceLocator.class, "lib/codemirror.css")));- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(- CodeMirrorResourceLocator.class, "theme/eclipse.css")));- return dependencies;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/ModeUrlResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/ModeUrlResourceReference.javadeleted file mode 100644index cfd83b66d3..0000000000--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/ModeUrlResourceReference.java+++ /dev/null@@ -1,46 +0,0 @@-package io.onedev.server.web.asset.codemirror;--import java.util.List;--import org.apache.wicket.markup.head.HeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.apache.wicket.request.resource.JavaScriptResourceReference;--import io.onedev.commons.utils.StringUtils;--public class ModeUrlResourceReference extends JavaScriptResourceReference {-- private static final long serialVersionUID = 1L;-- public ModeUrlResourceReference() {- // must use CodeMirrorResourceLocator.class as resource scope to- // make sure it is only loaded once- super(CodeMirrorResourceLocator.class, "blank.js");- }-- /*- * Since we have to rely on RequestCycle to get correct mode url, we can not bundle this resource,- * otherwise the getDependencies() method will be called to cause issues- */- @Override- public boolean canBeRegistered() {- return false;- }-- @Override- public List<HeaderItem> getDependencies() {- List<HeaderItem> dependencies = super.getDependencies();-- // must use CodeMirrorResourceLocator.class as resource scope to- // make sure it is only loaded once- JavaScriptResourceReference metaReference = new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "mode/meta.js");- String modeBase = StringUtils.substringBeforeLast(RequestCycle.get()- .urlFor(metaReference, new PageParameters()).toString(), "/");- dependencies.add(OnDomReadyHeaderItem.forScript("CodeMirror.modeURL = '" + modeBase + "/%N/%N.js';"));- return dependencies;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/SyntaxHighlightResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/SyntaxHighlightResourceReference.javadeleted file mode 100644index 1292385e41..0000000000--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/SyntaxHighlightResourceReference.java+++ /dev/null@@ -1,50 +0,0 @@-package io.onedev.server.web.asset.codemirror;--import java.util.List;--import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.HeaderItem;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.request.resource.JavaScriptResourceReference;--import io.onedev.server.web.page.base.BaseDependentResourceReference;-import io.onedev.server.web.resourcebundle.ResourceBundle;--@ResourceBundle-public class SyntaxHighlightResourceReference extends BaseDependentResourceReference {-- private static final long serialVersionUID = 1L;-- public SyntaxHighlightResourceReference() {- // must use CodeMirrorResourceLocator.class as resource scope to- // make sure it is only loaded once- super(CodeMirrorResourceLocator.class, "codemirror-integration.js");- }-- @Override- public List<HeaderItem> getDependencies() {- List<HeaderItem> dependencies = super.getDependencies();-- // must use CodeMirrorResourceLocator.class as resource scope to- // make sure it is only loaded once- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "lib/codemirror.js")));- dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(- CodeMirrorResourceLocator.class, "addon/runmode/runmode.js")));- dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(- CodeMirrorResourceLocator.class, "addon/mode/loadmode.js")));- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "mode/meta.js")));- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/mode/simple.js")));- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/mode/overlay.js")));- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(- CodeMirrorResourceLocator.class, "addon/mode/multiplex.js")));- dependencies.add(JavaScriptHeaderItem.forReference(new ModeUrlResourceReference()));- dependencies.add(CssHeaderItem.forReference(new CodeThemeCssResourceReference()));-- return dependencies;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/blank.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/blank.jsdeleted file mode 100644index e69de29bb2..0000000000diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.cssindex cc74aca508..aea42e5178 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css@@ -97,3 +97,18 @@background: var(--dark-mode-light-primary);color: var(--primary);}++.cm-s-eclipse span.cm-meta {+ color: #888;+}+.dark-mode .cm-s-eclipse span.cm-meta {+ color: #9899ac;+}++.cm-s-eclipse .CodeMirror-matchingbracket {+ outline: none;+ background: #69B7F7;+}+.dark-mode .cm-s-eclipse .CodeMirror-matchingbracket {+ background: var(--primary);+}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.jsindex 8812106765..a1b7000d05 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js@@ -221,3 +221,5 @@ $(document).on("beforeElementReplace", function(event, componentId) {this.submit = undefined;});});++CodeMirror.modeURL = '/wicket/resource/io.onedev.server.web.asset.codemirror.codemirrorresourcereference/mode/%N/%N.js';\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme-custom.cssdeleted file mode 100644index 2b5fef92b9..0000000000--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/theme-custom.css+++ /dev/null@@ -1,14 +0,0 @@-.cm-s-eclipse span.cm-meta {- color: #888;-}-.dark-mode .cm-s-eclipse span.cm-meta {- color: #9899ac;-}--.cm-s-eclipse .CodeMirror-matchingbracket {- outline: none;- background: #69B7F7;-}-.dark-mode .cm-s-eclipse .CodeMirror-matchingbracket {- background: var(--primary);-}diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.javaindex 812b08abfe..ed7bd4b100 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java@@ -8,7 +8,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;import io.onedev.server.web.asset.clipboard.ClipboardResourceReference;-import io.onedev.server.web.asset.codemirror.SyntaxHighlightResourceReference;+import io.onedev.server.web.asset.codemirror.CodeMirrorResourceReference;import io.onedev.server.web.asset.codeproblem.CodeProblemResourceReference;import io.onedev.server.web.asset.commentindicator.CommentIndicatorCssResourceReference;import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;@@ -28,7 +28,7 @@ public class TextDiffResourceReference extends BaseDependentResourceReference {@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(JavaScriptHeaderItem.forReference(new SyntaxHighlightResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new SelectionPopoverResourceReference()));diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.javaindex 8756df2c40..80ae8fb49b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import io.onedev.server.web.asset.atwho.AtWhoResourceReference;import io.onedev.server.web.asset.caret.CaretResourceReference;import io.onedev.server.web.asset.clipboard.ClipboardResourceReference;-import io.onedev.server.web.asset.codemirror.SyntaxHighlightResourceReference;+import io.onedev.server.web.asset.codemirror.CodeMirrorResourceReference;import io.onedev.server.web.asset.cookies.CookiesResourceReference;import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference;@@ -32,7 +32,7 @@ public class MarkdownResourceReference extends BaseDependentResourceReference {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new CaretResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new AtWhoResourceReference()));- dependencies.add(JavaScriptHeaderItem.forReference(new SyntaxHighlightResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new TextareaCaretPositionResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));diff --git a/server-core/src/main/java/io/onedev/server/web/resourcebundle/ResourceBundleReferences.java b/server-core/src/main/java/io/onedev/server/web/resourcebundle/ResourceBundleReferences.javaindex bd96ff066d..dabd0131cd 100644--- a/server-core/src/main/java/io/onedev/server/web/resourcebundle/ResourceBundleReferences.java+++ b/server-core/src/main/java/io/onedev/server/web/resourcebundle/ResourceBundleReferences.java@@ -177,20 +177,15 @@ public class ResourceBundleReferences {} catch (InstantiationException | IllegalAccessException e) {throw new RuntimeException(e);}- if (resource.canBeRegistered()) {- dependencyMap.put(resource, getDependencyAware(resource));- }+ dependencyMap.put(resource, getDependencyAware(resource));}}while (true) {Map<ResourceReference, DependencyAware<ResourceReference>> newDependencyMap = new LinkedHashMap<>(dependencyMap);for (DependencyAware<ResourceReference> dependent: dependencyMap.values()) {- for (ResourceReference dependency: dependent.getDependencies()) {- if (dependency.canBeRegistered()) {- newDependencyMap.put(dependency, getDependencyAware(dependency));- }- }+ for (ResourceReference dependency: dependent.getDependencies())+ newDependencyMap.put(dependency, getDependencyAware(dependency));}if (!dependencyMap.equals(newDependencyMap)) {dependencyMap = newDependencyMap;@@ -225,12 +220,8 @@ public class ResourceBundleReferences {public Set<ResourceReference> getDependencies() {Set<ResourceReference> dependencies = new LinkedHashSet<>();for (HeaderItem item: resource.getDependencies()) {- if (item instanceof IReferenceHeaderItem) {- ResourceReference reference = ((IReferenceHeaderItem) item).getReference();- if (reference.canBeRegistered()) {- dependencies.add(reference);- }- }+ if (item instanceof IReferenceHeaderItem)+ dependencies.add(((IReferenceHeaderItem) item).getReference());}return dependencies;}