Merge pull request #17 from undeadcat/master

Fix #16, update description in plugin.xml

Author: daedlock

src/main/kotlin/com/intellij/StyledComponents/Patterns.kt

@@ -8,6 +8,7 @@ import com.intellij.openapi.util.text.StringUtil
 import com.intellij.patterns.ElementPattern
 import com.intellij.patterns.PatternCondition
 import com.intellij.patterns.PlatformPatterns
+import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.util.ProcessingContext
 import com.intellij.util.SmartList
 import com.intellij.util.containers.ContainerUtil
@@ -51,7 +52,9 @@ fun getReferenceParts(jsReferenceExpression: JSReferenceExpression): List<String
         val name = ref.referenceName
         if (StringUtil.isEmptyOrSpaces(name)) return ContainerUtil.emptyList()
         nameParts.add(name)
-        ref = ref.qualifier as JSReferenceExpression?
+        val qualifier = ref.qualifier
+        ref = qualifier as? JSReferenceExpression
+                ?: PsiTreeUtil.findChildOfType(qualifier, JSReferenceExpression::class.java)
     }
     Collections.reverse(nameParts)
     return nameParts

src/main/resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>com.deadlock.scsyntax</id>
     <name>Styled Components</name>
-    <version>1.0</version>
+    <version>1.0.1</version>
     <vendor email="[email protected]" url="http://www.saraya.io">Kodehouse</vendor>
 
     <!-- Enable plugin for all products -->
@@ -11,8 +11,7 @@
     <depends>JavaScript</depends>
     <depends>org.jetbrains.plugins.less</depends>
     <description><![CDATA[
-      Language Support For React Styled Components
-      https://github.com/styled-components/styled-components
+      Language Support For <a href="https://github.com/styled-components/styled-components">React Styled Components</a>
     ]]></description>
 
     <change-notes><![CDATA[

src/test/InjectionTest.kt

@@ -8,7 +8,6 @@ import com.intellij.util.containers.ContainerUtil
 import org.junit.Assert
 
 class InjectionTest : LightCodeInsightFixtureTestCase() {
-
     fun testSimpleComponent() {
         doTest("const Title = styled.h1`\n" +
                 "  font-size: 1.5em;\n" +
@@ -25,8 +24,7 @@ class InjectionTest : LightCodeInsightFixtureTestCase() {
                 "   color: \${props => props.primary ? 'white' : 'palevioletred'};\n" +
                 "    " +
                 "    font-size: 1em;\n" +
-                "`;",
-                "div {\n" +
+                "`;","div {\n" +
                         "    /* Adapt the colours based on primary prop */\n" +
                         "   background: EXTERNAL_FRAGMENT;\n" +
                         "   color: EXTERNAL_FRAGMENT;\n" +
@@ -47,6 +45,15 @@ class InjectionTest : LightCodeInsightFixtureTestCase() {
                 "    color: palevioletred;\n" +
                 "}")
     }
+    
+    fun testComplexExpression2() {
+        doTest("const ContactMenuIcon = ((styled(Icon)))" +
+                ".attrs({ iconName: 'contact_card' })`\n" +
+                "  line-height: 0;\n" +
+                "`", "div {\n" +
+                "  line-height: 0;\n" +
+                "}")
+    }
 
     fun testKeyframes() {
         doTest("const rotate360 = keyframes`\n" +