From b166f69e9ee6436e918a4acb81abdaf633b77121 Mon Sep 17 00:00:00 2001 From: T45K Date: Mon, 22 Aug 2022 13:19:55 +0900 Subject: [PATCH] IDEA-300186 spock where table for Japanese Hragana and Katakana --- .../src/com/intellij/formatting/CoreFormatterUtil.java | 4 +++- .../groovy/formatter/spockTableWithFullwidthCharacters.test | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/platform/code-style-impl/src/com/intellij/formatting/CoreFormatterUtil.java b/platform/code-style-impl/src/com/intellij/formatting/CoreFormatterUtil.java index a00c44f2b8496..ed46f209e2251 100644 --- a/platform/code-style-impl/src/com/intellij/formatting/CoreFormatterUtil.java +++ b/platform/code-style-impl/src/com/intellij/formatting/CoreFormatterUtil.java @@ -252,7 +252,9 @@ public static LeafBlockWrapper getFirstLeaf(@NotNull AbstractBlockWrapper block) private static final Set FULLWIDTH_BLOCKS = Set.of(Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS, Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A, - Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS); + Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS, + Character.UnicodeBlock.HIRAGANA, + Character.UnicodeBlock.KATAKANA); public static boolean isFullwidthCharacter(int codePoint) { if (!Character.isValidCodePoint(codePoint)) { diff --git a/plugins/groovy/testdata/groovy/formatter/spockTableWithFullwidthCharacters.test b/plugins/groovy/testdata/groovy/formatter/spockTableWithFullwidthCharacters.test index 1c64abc5c6999..0fc568088dde3 100644 --- a/plugins/groovy/testdata/groovy/formatter/spockTableWithFullwidthCharacters.test +++ b/plugins/groovy/testdata/groovy/formatter/spockTableWithFullwidthCharacters.test @@ -7,6 +7,9 @@ class HelloSpockSpec extends spock.lang.Specification { "杰克瑞奇" | 5 "杰克瑞奇" | 4 "理查德" | 6 + "あいう" | 3 + "アイウ" | 3 + "ｱｲｳｴｵ" | 5 } } ----- @@ -19,5 +22,8 @@ class HelloSpockSpec extends spock.lang.Specification { "杰克瑞奇" | 5 "杰克瑞奇" | 4 "理查德" | 6 + "あいう" | 3 + "アイウ" | 3 + "ｱｲｳｴｵ" | 5 } }