MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-typing] Yet another fix for braces typing in string templates (IDEA-336810)

Browse Source 
GitOrigin-RevId: 70895c6be623545585ecf7f01f02fda73db8eea8
This commit is contained in:
Tagir Valeev
2023-11-28 13:53:34 +01:00
committed by intellij-monorepo-bot
parent 55fb552005
commit 8b1795dc3f
6 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/AbstractBasicJavaTypedHandler.java
View File

@@ -118,8 +118,9 @@ public abstract class AbstractBasicJavaTypedHandler extends TypedHandlerDelegate
HighlighterIterator iterator = editor.getHighlighter().createIterator(offset);
CharSequence sequence = editor.getDocument().getCharsSequence();
if (!iterator.atEnd() &&
(iterator.getTokenType() == JavaTokenType.STRING_TEMPLATE_END || iterator.getTokenType() == JavaTokenType.TEXT_BLOCK_TEMPLATE_END)) {
if (!iterator.atEnd() && iterator.getStart() == offset &&
(iterator.getTokenType() == JavaTokenType.STRING_TEMPLATE_END || iterator.getTokenType() == JavaTokenType.TEXT_BLOCK_TEMPLATE_END ||
iterator.getTokenType() == JavaTokenType.STRING_TEMPLATE_MID || iterator.getTokenType() == JavaTokenType.TEXT_BLOCK_TEMPLATE_MID)) {
if (sequence.length() > offset && sequence.charAt(offset) == '}') {
editor.getCaretModel().moveToOffset(offset + 1);
return Result.STOP;

12
java/java-frontback-tests/testSrc/com/intellij/codeInsight/AbstractBasicJavaTypingTest.java
View File

@@ -165,7 +165,17 @@ public abstract class AbstractBasicJavaTypingTest extends BasePlatformTestCase {
setLanguageLevel(LanguageLevel.JDK_21_PREVIEW);
doTest('}');
}
public void testEndStringTemplateMiddleTextBlock() {
setLanguageLevel(LanguageLevel.JDK_21_PREVIEW);
doTest('}');
}
public void testUnrelatedBraceInStringTemplate() {
setLanguageLevel(LanguageLevel.JDK_21_PREVIEW);
doTest('}');
}
protected void setLanguageLevel(@NotNull LanguageLevel level) {
LanguageLevelProjectExtension extension = LanguageLevelProjectExtension.getInstance(getProject());
LanguageLevel prev = extension.getLanguageLevel();

7
java/java-tests/testData/codeInsight/typing/endStringTemplateMiddleTextBlock_after.java Normal file
View File

@@ -0,0 +1,7 @@
class X {
String a2 = STR."""
\{a}<caret>tt \{a} t
""";
}

7
java/java-tests/testData/codeInsight/typing/endStringTemplateMiddleTextBlock_before.java Normal file
View File

@@ -0,0 +1,7 @@
class X {
String a2 = STR."""
\{a<caret>}tt \{a} t
""";
}

7
java/java-tests/testData/codeInsight/typing/unrelatedBraceInStringTemplate_after.java Normal file
View File

@@ -0,0 +1,7 @@
class X {
String a2 = STR."""
\{a} }<caret>}tt \{a} t
""";
}

7
java/java-tests/testData/codeInsight/typing/unrelatedBraceInStringTemplate_before.java Normal file
View File

@@ -0,0 +1,7 @@
class X {
String a2 = STR."""
\{a} <caret>}tt \{a} t
""";
}