Merge pull request #20 from undeadcat/expressionAtStartEnd

fix red code when string template arg is exactly at start/end

Author: daedlock

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

@@ -38,10 +38,12 @@ class StyledComponentsInjector : MultiHostInjector {
         val acceptedPattern = places.find { (elementPattern) -> elementPattern.accepts(injectionHost) }
         if (acceptedPattern != null) {
             val stringPlaces = getInjectionPlaces(injectionHost)
+            if (stringPlaces.isEmpty())
+                return
             registrar.startInjecting(LESSLanguage.INSTANCE)
             stringPlaces.forEachIndexed { index, (prefix, range, suffix) ->
-                val thePrefix = if (index == 0) acceptedPattern.prefix else prefix
-                val theSuffix = if (index == stringPlaces.size - 1) acceptedPattern.suffix else suffix
+                val thePrefix = if (index == 0) acceptedPattern.prefix + prefix.orEmpty() else prefix
+                val theSuffix = if (index == stringPlaces.size - 1) suffix.orEmpty() + acceptedPattern.suffix else suffix
                 registrar.addPlace(thePrefix, theSuffix, injectionHost, range)
             }
             registrar.doneInjecting()
@@ -61,6 +63,6 @@ class StyledComponentsInjector : MultiHostInjector {
         else result[result.size - 1]
     }
     data class PlaceInfo(val elementPattern: ElementPattern<JSStringTemplateExpression>,
-                         val prefix: String? = null,
-                         val suffix: String? = null)
+                         val prefix: String = "",
+                         val suffix: String = "")
 }

src/test/InjectionTest.kt

@@ -8,6 +8,12 @@ import com.intellij.util.containers.ContainerUtil
 import org.junit.Assert
 
 class InjectionTest : LightCodeInsightFixtureTestCase() {
+    
+    fun testTemplateArgumentIsWholeRange() {
+        doTest("let css = css`\${someVariable}`")
+        doTest("let globalCss = injectGlobal`\${someVariable}`")
+    }
+
     fun testCss() {
         doTest("let css = css`\n" +
                 "  color:red;\n" +
@@ -110,12 +116,18 @@ class InjectionTest : LightCodeInsightFixtureTestCase() {
                 "  }\n")
     }
 
-    private fun doTest(fileContent: String, expected: String) {
+    fun testTemplateArgsAtStartEndOfString() {
+        doTest("let atStart = styled.div`\${getPropName()}:red`\n" +
+                "let atEnd = styled.div`color:\${getColor()}`\n",
+                "div {EXTERNAL_FRAGMENT:red}",
+                "div {color:EXTERNAL_FRAGMENT}")
+    }
+
+    private fun doTest(fileContent: String, vararg expected: String) {
         myFixture.setCaresAboutInjection(true)
         val file = myFixture.configureByText("dummy.es6", fileContent)
         val injections = collectInjectedPsiContents(file)
-        Assert.assertEquals(1, injections.size)
-        Assert.assertEquals(expected, injections[0])
+        Assert.assertEquals(expected.toList(), injections)
     }
 
     private fun collectInjectedPsiContents(file: PsiFile): List<String> {