fixed include completion

fkorotkov · Mar 18, 2015 · 4022916 · groz · Dec 11, 2017 · 4022916
1 parent b3ef6da
commit 4022916
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/src/com/intellij/plugins/thrift/util/ThriftPsiUtil.java b/src/com/intellij/plugins/thrift/util/ThriftPsiUtil.java
@@ -82,7 +82,12 @@ private static FileReferenceSet getReferenceSet(@NotNull ThriftInclude include)
     final String path = getPath(include);
     return new FileReferenceSet(
       path, include, element.getStartOffsetInParent() + 1, null, true, true, new FileType[]{ThriftFileType.INSTANCE}
-    );
+    ) {
+      @Override
+      public boolean isAbsolutePathReference() {
+        return true;
+      }
+    };
   }
 
   @NotNull

diff --git a/testData/completion/reference/include/include.thrift b/testData/completion/reference/include/include.thrift
@@ -0,0 +1 @@
+include 'foo/b<caret>'
diff --git a/testSrc/com/intellij/plugins/thrift/completion/ThriftReferenceCompletionTest.java b/testSrc/com/intellij/plugins/thrift/completion/ThriftReferenceCompletionTest.java
@@ -10,14 +10,30 @@ public ThriftReferenceCompletionTest() {
     super("completion/reference");
   }
 
-  public void testInclude() throws Throwable {
+  public void testInclude1() throws Throwable {
     myFixture.addFileToProject("bar.thrift", "");
     myFixture.addFileToProject("baz.thrift", "");
     myFixture.configureByText(ThriftFileType.INSTANCE, "include 'b<caret>'");
     myFixture.completeBasic();
     checkCompletion(CheckType.INCLUDES, "bar.thrift", "baz.thrift");
   }
 
+  public void testInclude2() throws Throwable {
+    myFixture.addFileToProject("foo/bar.thrift", "");
+    myFixture.addFileToProject("foo/baz.thrift", "");
+    myFixture.configureByText(ThriftFileType.INSTANCE, "include 'foo/b<caret>'");
+    myFixture.completeBasic();
+    checkCompletion(CheckType.INCLUDES, "bar.thrift", "baz.thrift");
+  }
+
+  public void testInclude3() throws Throwable {
+    myFixture.addFileToProject("foo/bar.thrift", "");
+    myFixture.addFileToProject("foo/baz.thrift", "");
+    myFixture.configureByFile("include/include.thrift");
+    myFixture.completeBasic();
+    checkCompletion(CheckType.INCLUDES, "bar.thrift", "baz.thrift");
+  }
+
   public void testExtends() throws Throwable {
     doTest();
   }