MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-typing] Skip closing brace after non-first embedded expression (IDEA-336810)

Browse Source 
GitOrigin-RevId: a3a06e08fba502cf58ef08774cf4a7e3401a7a97
This commit is contained in:
Tagir Valeev
2023-11-06 11:05:41 +01:00
committed by intellij-monorepo-bot
parent d5ccfc998a
commit f179a8a2e9
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,7 +119,8 @@ public abstract class AbstractBasicJavaTypedHandler extends TypedHandlerDelegate
HighlighterIterator iterator = editor.getHighlighter().createIterator(offset-1);
CharSequence sequence = editor.getDocument().getCharsSequence();
if (!iterator.atEnd() &&
(iterator.getTokenType() == JavaTokenType.STRING_TEMPLATE_BEGIN || iterator.getTokenType() == JavaTokenType.TEXT_BLOCK_TEMPLATE_BEGIN) &&
(iterator.getTokenType() == JavaTokenType.STRING_TEMPLATE_BEGIN || iterator.getTokenType() == JavaTokenType.TEXT_BLOCK_TEMPLATE_BEGIN ||
iterator.getTokenType() == JavaTokenType.STRING_TEMPLATE_MID || iterator.getTokenType() == JavaTokenType.TEXT_BLOCK_TEMPLATE_MID) &&
iterator.getEnd() == offset && sequence.subSequence(iterator.getStart(), iterator.getEnd()).toString().equals("\\{")) {
if (sequence.length() > offset && sequence.charAt(offset) == '}') {
editor.getCaretModel().moveToOffset(offset + 1);

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

@@ -156,6 +156,11 @@ public abstract class AbstractBasicJavaTypingTest extends BasePlatformTestCase {
doTest('}');
}
public void testEndSecondStringTemplateTextBlock() {
setLanguageLevel(LanguageLevel.JDK_21_PREVIEW);
doTest('}');
}
protected void setLanguageLevel(@NotNull LanguageLevel level) {
LanguageLevelProjectExtension extension = LanguageLevelProjectExtension.getInstance(getProject());
LanguageLevel prev = extension.getLanguageLevel();

4
java/java-tests/testData/codeInsight/typing/endSecondStringTemplateTextBlock_after.java Normal file
View File

@@ -0,0 +1,4 @@
class X {
String str = STR."""
\{} \{}<caret>"""
}

4
java/java-tests/testData/codeInsight/typing/endSecondStringTemplateTextBlock_before.java Normal file
View File

@@ -0,0 +1,4 @@
class X {
String str = STR."""
\{} \{<caret>}"""
}