#94 Better keywords completion inside classdef

src/com/github/kornilova203/matlab/completion/MatlabKeywordCompletionContributor.kt

@@ -26,6 +26,10 @@ class MatlabKeywordCompletionContributor : CompletionContributor() {
         )
         private val IN_CYCLE = and(M, or(IDENT.inside(MatlabWhileLoop::class.java), IDENT.inside(MatlabForLoop::class.java)))
         private val IN_CLASS = and(M, psiElement().withSuperParent(2, MatlabClassDeclaration::class.java))
+        private val IN_CLASS_PROPERTIES = and(M, psiElement().withSuperParent(3, MatlabPropertiesBlock::class.java))
+        private val IN_CLASS_METHODS = and(M, psiElement().withSuperParent(3, MatlabMethodsBlock::class.java))
+        private val IN_CLASS_EVENTS = and(M, psiElement().withSuperParent(3, MatlabEventsBlock::class.java))
+        private val IN_CLASS_ENUMERATIONS = and(M, psiElement().withSuperParent(2, MatlabEnumerationBlock::class.java))
     }
 
     init {
@@ -44,7 +48,14 @@ class MatlabKeywordCompletionContributor : CompletionContributor() {
         extend(CompletionType.BASIC, 
                 psiElement().and(IN_CLASS), 
                 provider("properties", "methods", "events", "enumeration", "end"))
-
+
+        extend(CompletionType.BASIC,
+                psiElement().and(or(IN_CLASS_PROPERTIES, IN_CLASS_METHODS, IN_CLASS_EVENTS, IN_CLASS_ENUMERATIONS)),
+                provider("end"))
+
+        extend(CompletionType.BASIC,
+                psiElement().and(IN_CLASS_METHODS),
+                provider("function"))
     }
 
     private fun provider(vararg keywords: String): CompletionProvider<CompletionParameters> {

testData/completion/EndInEnumeration.after.m

@@ -0,0 +1,6 @@
+classdef C
+    enumeration
+        Error   (1, 0, 0)
+    end
+    % blank
+end

testData/completion/EndInEnumeration.m

@@ -0,0 +1,5 @@
+classdef C
+    enumeration
+        Error   (1, 0, 0)
+        e<caret>
+end

testData/completion/EndInEvents.after.m

@@ -0,0 +1,6 @@
+classdef C
+    events
+        ToggledState
+    end
+    % blank
+end

testData/completion/EndInEvents.m

@@ -0,0 +1,5 @@
+classdef C
+    events
+        ToggledState
+        e<caret>
+end

testData/completion/EndInMethods.after.m

@@ -0,0 +1,7 @@
+classdef C
+    methods
+        function f
+        end
+    end
+    % blank
+end

testData/completion/EndInMethods.m

@@ -0,0 +1,6 @@
+classdef C
+    methods
+        function f
+        end
+        e<caret>
+end

testData/completion/EndInProperties.after.m

@@ -0,0 +1,6 @@
+classdef C
+    properties
+        my_prop
+    end
+    % blank
+end

testData/completion/EndInProperties.m

@@ -0,0 +1,5 @@
+classdef C
+    properties
+        my_prop
+        e<caret>
+end

testData/completion/FunctionInMethods.after.m

@@ -0,0 +1,4 @@
+classdef C
+    methods
+        function
+end

testData/completion/FunctionInMethods.m

@@ -0,0 +1,4 @@
+classdef C
+    methods
+        f<caret>
+end

tests/com/github/kornilova203/matlab/completion/CompletionTest.kt

@@ -25,6 +25,11 @@ class CompletionTest : BasePlatformTestCase() {
     fun testClassName() = doTestMultiFile("ClassNameAdd")
     fun testFunction() = doTestMultiFile("FunctionAdd")
     fun testFunctionWithParenth() = doTestMultiFile("FunctionWithParenthAdd")
+    fun testEndInProperties() = doTest("end")
+    fun testEndInMethods() = doTest("end")
+    fun testEndInEvents() = doTest("end")
+    fun testEndInEnumeration() = doTest("end")
+    fun testFunctionInMethods() = doTest("function")
 
     private fun doTest(vararg completionVariants: String) {
         myFixture.configureByFile(getTestFilePath())
@@ -34,7 +39,8 @@ class CompletionTest : BasePlatformTestCase() {
         val afterFile = testDataPath + "/" + getTestName(false) + ".after.m"
         if (File(afterFile).exists()) {
             myFixture.finishLookup('\n')
-            UsefulTestCase.assertSameLinesWithFile(afterFile, myFixture.file.text)
+            val actual = myFixture.file.text.replace("(^|.*[^ ]) +$".toRegex(RegexOption.MULTILINE), "$0% blank")
+            UsefulTestCase.assertSameLinesWithFile(afterFile, actual)
         }
     }