MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

WEB-45876 CSS plugin(bundled) requires restart on disable (ourDefaultStyleLanguage, ourInlineStyleElementType)

Browse Source 
GitOrigin-RevId: 50435c475d83de4ea8eb487671b49d455918d43c
This commit is contained in:
Alexander Doroshko
2020-06-08 22:36:29 +03:00
committed by intellij-monorepo-bot
parent 72afce383e
commit 1dc5e49365
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/brokenPlugins.txt
+3 -1
View File
@@ -166,4 +166,6 @@ CodeHistoryMining "0.1 beta" "0.1.1 beta" "0.1.2 beta" "0.1.3 beta" "0.1.4 beta"
ru.crazycoder.plugins.tabdir 1.6.6 1.6.1 1.6
com.jetbrains.php.composer.resolve 1.0
"ev3dev C/C++" "0.7.2 (51324)"
javaFMI 1.0.0
javaFMI 1.0.0
fistache.framework.id 1.1.3
dev.blachut.svelte.lang 0.12.1
xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java
+5 -6
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.lexer;
import com.intellij.codeInsight.completion.CompletionUtilCore;
@@ -34,8 +34,6 @@ public abstract class BaseHtmlLexer extends DelegateLexer {
private static final int SEEN_STYLE_SCRIPT_SHIFT = 10;
private static final int SEEN_STYLE_SCRIPT_MASK = 0x7 << SEEN_STYLE_SCRIPT_SHIFT;
protected static final int BASE_STATE_SHIFT = 13;
@Nullable
protected static final Language ourDefaultStyleLanguage = Language.findLanguageByID("CSS");
protected boolean seenTag;
protected boolean seenAttribute;
@@ -187,8 +185,9 @@ public abstract class BaseHtmlLexer extends DelegateLexer {
@Nullable
protected Language getStyleLanguage() {
if (ourDefaultStyleLanguage != null && styleType != null && !"text/css".equals(styleType)) {
for (Language language : ourDefaultStyleLanguage.getDialects()) {
Language cssLanguage = Language.findLanguageByID("CSS");
if (cssLanguage != null && styleType != null && !"text/css".equals(styleType)) {
for (Language language : cssLanguage.getDialects()) {
for (String mimeType : language.getMimeTypes()) {
if (styleType.equals(mimeType)) {
return language;
@@ -196,7 +195,7 @@ public abstract class BaseHtmlLexer extends DelegateLexer {
}
}
}
return ourDefaultStyleLanguage;
return cssLanguage;
}
@Nullable