🐛 Fix support for clion

yoavst · Jul 19, 2024 · d18797f · d18797f
1 parent eff869c
commit d18797f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/backends/intellij/base/src/main/kotlin/com/yoavst/graffiti/intellij/lang/Language.kt b/backends/intellij/base/src/main/kotlin/com/yoavst/graffiti/intellij/lang/Language.kt
@@ -26,7 +26,7 @@ interface Language {
                 val lang = newLang("com.yoavst.graffiti.intellij.lang.Kotlin")
                 languages[lang.name] = lang
             }
-            if (isPluginEnabled("com.intellij.modules.clion")) {
+            if (isPluginEnabled("com.intellij.modules.clion") || isPluginEnabled("com.intellij.clion")) {
                 val lang = newLang("com.yoavst.graffiti.intellij.lang.Cpp")
                 languages[lang.name] = lang
             }

diff --git a/backends/intellij/cpp/src/main/kotlin/com/yoavst/graffiti/intellij/lang/Cpp.kt b/backends/intellij/cpp/src/main/kotlin/com/yoavst/graffiti/intellij/lang/Cpp.kt
@@ -2,6 +2,7 @@ package com.yoavst.graffiti.intellij.lang
 
 import com.intellij.psi.*
 import com.intellij.psi.util.PsiTreeUtil
+import com.jetbrains.cidr.lang.psi.OCCppNamespace
 import com.jetbrains.cidr.lang.psi.OCDeclarator
 import com.jetbrains.cidr.lang.psi.OCFile
 import com.jetbrains.cidr.lang.psi.OCFunctionDeclaration
@@ -11,23 +12,23 @@ import com.yoavst.graffiti.intellij.models.MemberType
 import com.yoavst.graffiti.intellij.toAddress
 
 object Cpp : Language {
-    override val name get() = "OCSlow"
+    override val name get() = "ObjectiveC"
 
     override fun getNodeInfo(element: PsiElement?, psiFile: PsiFile): Info? {
         if (psiFile !is OCFile) {
             return null
         }
 
-        // TODO: support Cpp namespaces
-        val outerStruct = PsiTreeUtil.getParentOfType(element, OCStruct::class.java)
+        val outerContainer = PsiTreeUtil.getParentOfType(element, OCStruct::class.java) ?:
+        PsiTreeUtil.getParentOfType(element, OCCppNamespace::class.java)
 
         val method = PsiTreeUtil.getParentOfType(element, OCFunctionDeclaration::class.java)
-        if (method != null) return getMemberInfo(psiFile, method, method.declarator?.namespaceQualifier?.name ?: outerStruct?.name, MemberType.Method)
+        if (method != null) return getMemberInfo(psiFile, method, method.declarator?.namespaceQualifier?.name ?: outerContainer?.name, MemberType.Method)
 
         val declarator = PsiTreeUtil.getParentOfType(element, OCDeclarator::class.java)
-        if (declarator != null) return getMemberInfo(psiFile, declarator, declarator.namespaceQualifier?.name ?: outerStruct?.name, MemberType.Field)
+        if (declarator != null) return getMemberInfo(psiFile, declarator, declarator.namespaceQualifier?.name ?: outerContainer?.name, MemberType.Field)
 
-        if (outerStruct != null) return Info.Class(outerStruct, outerStruct.name ?: "<anonymous>", psiFile.name, outerStruct.toAddress())
+        if (outerContainer != null) return Info.Class(outerContainer, outerContainer.name ?: "<anonymous>", psiFile.name, outerContainer.toAddress())
         return Info.File(psiFile.name, psiFile.toAddress())
     }