MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

disable HTML tag auto-closing inside JavaDoc inline tags (IDEA-66096)

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-01-21 18:21:55 +01:00
parent d8129a2271
commit cb13dccb2e
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/java-impl/src/com/intellij/codeInsight/editorActions/JavadocTypedHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 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.
@@ -25,6 +25,8 @@ import com.intellij.psi.impl.source.javadoc.PsiDocParamRef;
import com.intellij.psi.impl.source.tree.JavaDocElementType;
import com.intellij.psi.javadoc.PsiDocTag;
import com.intellij.psi.javadoc.PsiDocTagValue;
import com.intellij.psi.javadoc.PsiInlineDocTag;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.xml.util.HtmlUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -44,7 +46,7 @@ public class JavadocTypedHandler extends TypedHandlerDelegate {
@Override
public Result charTyped(char c, Project project, @NotNull Editor editor, @NotNull PsiFile file) {
if (project == null || editor == null || file == null) {
if (project == null) {
return Result.CONTINUE;
}
insertClosingTagIfNecessary(c, project, editor, file);
@@ -169,7 +171,12 @@ public class JavadocTypedHandler extends TypedHandlerDelegate {
if (value == null || value.getTextRange().getEndOffset() == offset) {
return false;
}
}
}
}
// The contents of inline tags is not HTML, so the paired tag completion isn't appropriate there.
if (PsiTreeUtil.getParentOfType(element, PsiInlineDocTag.class, false) != null) {
return false;
}
ASTNode node = element.getNode();

2
java/java-tests/testData/codeInsight/editorActions/javadocTypedHandler/codeTag.java Normal file
View File

@@ -0,0 +1,2 @@
/** {@code <a<caret>} */
public class A {}

2
java/java-tests/testData/codeInsight/editorActions/javadocTypedHandler/codeTag_after.java Normal file
View File

@@ -0,0 +1,2 @@
/** {@code <a>} */
public class A {}

6
java/java-tests/testSrc/com/intellij/codeInsight/editorActions/JavadocTypedHandlerFunctionalTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 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.
@@ -28,6 +28,10 @@ public class JavadocTypedHandlerFunctionalTest extends LightPlatformCodeInsightT
doTest();
}
public void testCodeTag() {
doTest();
}
private void doTest() {
String testName = getTestName(true);
configureByFile(BASE_PATH + testName + ".java");