From f4ff001c64cb7f3f4957c654d5e8162c73e5581c Mon Sep 17 00:00:00 2001
From: Konstantin Ulitin <konstantin.ulitin@jetbrains.com>
Date: Wed, 2 Sep 2015 15:03:00 +0300
Subject: [PATCH] use common code style settings from grandparent language

---
 .../psi/codeStyle/CommonCodeStyleSettingsManager.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettingsManager.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettingsManager.java
index b59f14a8a709..61d827693091 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettingsManager.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettingsManager.java
@@ -61,8 +61,9 @@ public class CommonCodeStyleSettingsManager implements JDOMExternalizable {
   public CommonCodeStyleSettings getCommonSettings(@Nullable Language lang) {
     Map<Language, CommonCodeStyleSettings> commonSettingsMap = getCommonSettingsMap();
     CommonCodeStyleSettings settings = commonSettingsMap.get(lang);
-    if (settings == null && lang != null) {
-      settings = commonSettingsMap.get(lang.getBaseLanguage());
+    while (settings == null && lang != null) {
+      lang = lang.getBaseLanguage();
+      settings = commonSettingsMap.get(lang);
     }
     if (settings != null) {
       return settings;