Merge pull request #201 from cedricziel/quoted-table-names

Expand table name regex to match quoted identifiers

Author: cedricziel

typo3-cms/src/main/java/com/cedricziel/idea/typo3/index/TablenameFileIndex.java

@@ -14,7 +14,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class TablenameFileIndex extends FileBasedIndexExtension <String, TextRange> {
+public class TablenameFileIndex extends FileBasedIndexExtension<String, TextRange> {
 
     public static ID<String, TextRange> KEY = ID.create("com.cedricziel.idea.typo3.index.tablename");
 
@@ -33,16 +33,22 @@ public DataIndexer<String, TextRange, FileContent> getIndexer() {
             CharSequence charSequence = LoadTextUtil.loadText(inputData.getFile());
 
             final Matcher matcher = Pattern
-                    .compile("create\\s+table\\s+(if\\s+not\\s+exists\\s+)?([a-zA-Z_0-9]+)", Pattern.CASE_INSENSITIVE)
-                    .matcher(charSequence);
+                .compile("create\\s+table\\s+(if\\s+not\\s+exists\\s+)?([a-zA-Z_0-9]+)?(`[a-zA-Z_0-9]+`)?", Pattern.CASE_INSENSITIVE)
+                .matcher(charSequence);
 
             try {
                 while (matcher.find()) {
                     if (matcher.groupCount() < 2) {
                         return map;
                     }
 
-                    map.put(matcher.group(2), new TextRange(matcher.start(), matcher.end()));
+                    if (matcher.group(2) != null) {
+                        String group = matcher.group(2);
+                        map.put(group, new TextRange(matcher.start(), matcher.end()));
+                    } else if (matcher.group(3) != null) {
+                        String group = matcher.group(3);
+                        map.put(group.substring(1, group.length() - 1), new TextRange(matcher.start(), matcher.end()));
+                    }
                 }
             } catch (IllegalStateException e) {
                 // no matches
@@ -66,7 +72,7 @@ public DataExternalizer<TextRange> getValueExternalizer() {
 
     @Override
     public int getVersion() {
-        return 0;
+        return 1;
     }
 
     @NotNull

typo3-cms/src/test/java/com/cedricziel/idea/typo3/index/TablenameIndexTest.java

@@ -0,0 +1,36 @@
+package com.cedricziel.idea.typo3.index;
+
+import com.cedricziel.idea.typo3.AbstractTestCase;
+import com.cedricziel.idea.typo3.util.TableUtil;
+
+public class TablenameIndexTest extends AbstractTestCase {
+    public void testTablenameIsExtractedCorrectly() {
+        myFixture.configureByText("ext_tables.sql", "CREATE TABLE foo {}");
+        assertContainsLookupElementWithText(
+            TableUtil.createAvailableTableNamesLookupElements(myFixture.getProject()),
+            "foo"
+        );
+
+        myFixture.configureByText("ext_tables.sql", "CREATE TABLE `bar` {}");
+        assertContainsLookupElementWithText(
+            TableUtil.createAvailableTableNamesLookupElements(myFixture.getProject()),
+            "bar"
+        );
+
+        myFixture.configureByText("ext_tables.sql", "CREATE TABLE `bingo {}");
+        assertNotContainsLookupElementWithText(
+            TableUtil.createAvailableTableNamesLookupElements(myFixture.getProject()),
+            "bingo"
+        );
+        assertNotContainsLookupElementWithText(
+            TableUtil.createAvailableTableNamesLookupElements(myFixture.getProject()),
+            "`bingo"
+        );
+
+        myFixture.configureByText("ext_tables.sql", "CREATE TABLE bongo` {}");
+        assertNotContainsLookupElementWithText(
+            TableUtil.createAvailableTableNamesLookupElements(myFixture.getProject()),
+            "bongo`"
+        );
+    }
+}