mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
WEB-11268 Live Templates in auto-completion interfere with Emmet/Zen expand
- disable autopopup in HTML
This commit is contained in:
@@ -127,6 +127,7 @@
|
||||
|
||||
<completion.confidence language="XML" implementationClass="com.intellij.codeInsight.completion.XmlNameCompletionConfidence" id="xml"/>
|
||||
<completion.confidence language="HTML" implementationClass="com.intellij.codeInsight.completion.XmlNameCompletionConfidence" id="html"/>
|
||||
<completion.confidence language="HTML" implementationClass="com.intellij.codeInsight.completion.HtmlTextCompletionConfidence" id="htmlText"/>
|
||||
|
||||
<lookup.charFilter implementation="com.intellij.codeInsight.completion.XmlCharFilter" id="xml"/>
|
||||
|
||||
|
||||
+44
@@ -0,0 +1,44 @@
|
||||
/*
|
||||
* Copyright 2000-2014 JetBrains s.r.o.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
package com.intellij.codeInsight.completion;
|
||||
|
||||
import com.intellij.lang.ASTNode;
|
||||
import com.intellij.openapi.util.text.StringUtil;
|
||||
import com.intellij.psi.PsiElement;
|
||||
import com.intellij.psi.PsiFile;
|
||||
import com.intellij.psi.xml.XmlDocument;
|
||||
import com.intellij.psi.xml.XmlText;
|
||||
import com.intellij.psi.xml.XmlTokenType;
|
||||
import com.intellij.util.ThreeState;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
public class HtmlTextCompletionConfidence extends CompletionConfidence {
|
||||
@NotNull
|
||||
@Override
|
||||
public ThreeState shouldSkipAutopopup(@NotNull PsiElement contextElement, @NotNull PsiFile psiFile, int offset) {
|
||||
ASTNode node = contextElement.getNode();
|
||||
if (node != null && node.getElementType() == XmlTokenType.XML_DATA_CHARACTERS) {
|
||||
PsiElement parent = contextElement.getParent();
|
||||
if (parent instanceof XmlText || parent instanceof XmlDocument) {
|
||||
String prefix = contextElement.getText().substring(0, offset - contextElement.getTextRange().getStartOffset());
|
||||
if (StringUtil.isJavaIdentifier(prefix)) {
|
||||
return ThreeState.YES;
|
||||
}
|
||||
}
|
||||
}
|
||||
return ThreeState.UNSURE;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
/*
|
||||
* Copyright 2000-2014 JetBrains s.r.o.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
package com.intellij.codeInsight.completion;
|
||||
|
||||
import com.intellij.ide.highlighter.HtmlFileType;
|
||||
import com.intellij.openapi.fileTypes.FileType;
|
||||
|
||||
public class XmlAutopopupTest extends CompletionAutoPopupTestCase {
|
||||
public void testDoNotShowPopupInText() throws Exception {
|
||||
doTestNoPopup(HtmlFileType.INSTANCE, "<div><caret></div>", "p");
|
||||
}
|
||||
|
||||
public void testAfterTagOpen() throws Exception {
|
||||
doTestPopup(HtmlFileType.INSTANCE, "<div><caret></div>", "<");
|
||||
}
|
||||
|
||||
private void doTestPopup(FileType fileType, String fileText, String typeString) {
|
||||
myFixture.configureByText(fileType, fileText);
|
||||
type(typeString);
|
||||
assertNotNull(getLookup());
|
||||
}
|
||||
|
||||
private void doTestNoPopup(FileType fileType, String fileText, String typeString) {
|
||||
myFixture.configureByText(fileType, fileText);
|
||||
type(typeString);
|
||||
assertNull(getLookup());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user