Support for code completion for AppController fields #50

Author: junichi11

src/org/cakephp/netbeans/editor/CakePhpEditorExtender.java

@@ -106,6 +106,15 @@ public List<PhpBaseElement> getElementsForCodeCompletion(FileObject fo) {
         List<PhpBaseElement> elements;
         elements = new LinkedList<PhpBaseElement>();
 
+        // get AppController
+        CakePhpModule cakeModule = CakePhpModule.forPhpModule(phpModule);
+        FileObject appController = cakeModule.getFile(DIR_TYPE.APP, CakePhpModule.FILE_TYPE.CONTROLLER, "App", null);
+        if (appController != null) {
+            for (PhpClass phpClass : parseFields(appController)) {
+                elements.add(new PhpVariable("$this", phpClass, fo, 0)); // NOI18N
+            }
+        }
+
         for (PhpClass phpClass : parseFields(fo)) {
             if (isView || isHelper) {
                 addDefaultHelpers(phpClass, fo);
@@ -220,6 +229,15 @@ private PhpClass getPhpClass(FileObject fo) {
         if (CakePhpUtils.isComponent(fo)) {
             return getComponentPhpClass();
         } else if (CakePhpUtils.isController(fo)) {
+            // get AppController fields info.
+            String name = fo.getName();
+            name = CakePhpUtils.toUnderscoreCase(name);
+            if ("app_controller".equals(name)) { // NOI18N
+                FileObject currentFileObject = CakePhpUtils.getCurrentFileObject();
+                if (currentFileObject != null && CakePhpUtils.isView(currentFileObject)) {
+                    return getViewPhpClass();
+                }
+            }
             return getControllerPhpClass();
         } else if (CakePhpUtils.isCtpFile(fo)) {
             return getViewPhpClass();

src/org/cakephp/netbeans/editor/visitors/CakePhpControllerVisitor.java

@@ -202,6 +202,17 @@ public void visit(ExpressionStatement node) {
     @Override
     public Set<String> getFieldNames() {
         Set<String> fieldNames = new HashSet<String>();
+
+        // get AppController fields info.
+        String name = CakePhpUtils.toUnderscoreCase(targetFile.getName());
+        if ("app_controller".equals(name)) { // NOI18N
+            FileObject currentFileObject = CakePhpUtils.getCurrentFileObject();
+            if (currentFileObject != null && CakePhpUtils.isView(currentFileObject)) {
+                fieldNames.add(HELPERS);
+                return fieldNames;
+            }
+        }
+
         if (isController) {
             fieldNames.add(USES);
             fieldNames.add(COMPONENTS);

src/org/cakephp/netbeans/util/CakePhpUtils.java

@@ -46,9 +46,13 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.regex.Pattern;
+import javax.swing.text.Document;
+import javax.swing.text.JTextComponent;
 import org.cakephp.netbeans.CakePhp;
 import org.cakephp.netbeans.CakePhpFrameworkProvider;
 import org.cakephp.netbeans.module.CakePhpModule;
+import org.netbeans.api.editor.EditorRegistry;
+import org.netbeans.modules.editor.NbEditorUtilities;
 import org.netbeans.modules.php.api.editor.EditorSupport;
 import org.netbeans.modules.php.api.editor.PhpBaseElement;
 import org.netbeans.modules.php.api.editor.PhpClass;
@@ -383,4 +387,15 @@ public static String[] pluginSplit(String name) {
         }
         return new String[]{name};
     }
+
+    public static FileObject getCurrentFileObject() {
+        JTextComponent editor = EditorRegistry.lastFocusedComponent();
+        if (editor != null) {
+            Document document = editor.getDocument();
+            if (document != null) {
+                return NbEditorUtilities.getFileObject(document);
+            }
+        }
+        return null;
+    }
 }