bug fixes for view and config string inputs autocomplete

Author: haidubogdan

.github/workflows/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## What's changed
 
-Update executable tool via docker for laravel commands.
+Bug fixes for `view` and `config` method string param autocomplete, CTRL + Click
 
 **Windows**
 

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [1.0.0.13]
+
+Bug fixes for `view` and `config` method string param autocomplete, CTRL + Click
+
 ## [1.0.0.12]
 
 Update executable tool via docker for laravel commands.

manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.netbeans.modules.php.laravel
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/laravel/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0.0.12
+OpenIDE-Module-Specification-Version: 1.0.0.13
 

src/org/netbeans/modules/php/laravel/editor/HyperlinkProviderImpl.java

@@ -2,14 +2,11 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.EnumSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
-import javax.swing.tree.MutableTreeNode;
 import org.netbeans.api.editor.*;
 import org.netbeans.api.editor.mimelookup.MimeRegistration;
 import org.netbeans.lib.editor.hyperlink.spi.HyperlinkProviderExt;
@@ -25,11 +22,9 @@
 import org.netbeans.modules.php.laravel.astnodes.ArrayFileVisitor.ConfigNamespace;
 import org.netbeans.modules.php.laravel.utils.PathUtils;
 import org.netbeans.modules.php.laravel.project.ProjectUtils;
-import org.netbeans.modules.php.laravel.utils.LaravelUtils;
 import org.netbeans.modules.php.laravel.utils.StringUtils;
 import org.openide.filesystems.FileObject;
 import org.openide.loaders.DataObject;
-import org.openide.text.DataEditorSupport;
 import org.openide.text.Line;
 import org.openide.text.NbDocument;
 import org.openide.util.Exceptions;
@@ -114,9 +109,11 @@ public int[] getHyperlinkSpan(Document doc, int offset, HyperlinkType type) {
                 PhpModule module;
                 //tooltip text
                 switch (methodName) {
-                    case "view":
-                    case "make":
-                    case "render":
+                    case "view": // NOI18N
+                    case "make": // NOI18N
+                    case "render": // NOI18N
+                    case "send": // NOI18N
+                    case "loadView": // NOI18N 
                         module = ProjectUtils.getPhpModule(doc);
                         FileObject dir = module.getSourceDirectory();
                         if (dir != null) {
@@ -129,16 +126,15 @@ public int[] getHyperlinkSpan(Document doc, int offset, HyperlinkType type) {
                             goToOffset = 0;
                         }
                         return new int[]{startOffset, startOffset + currentToken.length()};
-                    case "config":
+                    case "config": // NOI18N
                         module = ProjectUtils.getPhpModule(doc);
                         if (module == null) {
                             break;
                         }
                         String[] queryConfigNamespace = identifiableText.split("\\.");
 
-//                        ConfigurationFiles confFiles = ConfigurationFiles.getInstance(module);
+                        ConfigurationFiles confFiles = (ConfigurationFiles) LaravelPhpFrameworkProvider.getInstance().getConfigurationFiles2(module);
 
-                        ConfigurationFiles confFiles = null;
                         if (confFiles == null) {
                             break;
                         }
@@ -201,6 +197,8 @@ public void performClickAction(Document doc, int offset, HyperlinkType type) {
                     case "view":
                     case "make":
                     case "render":
+                    case "send":
+                    case "loadView":
                     case "config":
                         if (goToFile != null) {
                             openDocument(goToFile, goToOffset);

src/org/netbeans/modules/php/laravel/editor/completion/LaravelCompletionProvider.java

@@ -18,6 +18,7 @@ Licensed to the Apache Software Foundation (ASF)
 import org.netbeans.modules.php.api.util.FileUtils;
 import org.netbeans.modules.php.editor.lexer.PHPTokenId;
 import org.netbeans.modules.php.laravel.ConfigurationFiles;
+import org.netbeans.modules.php.laravel.LaravelPhpFrameworkProvider;
 import org.netbeans.modules.php.laravel.editor.EditorUtils;
 import org.netbeans.modules.php.laravel.editor.ResourceUtilities;
 import org.netbeans.modules.php.laravel.project.ProjectUtils;
@@ -41,7 +42,7 @@ public class LaravelCompletionProvider implements CompletionProvider {
 
     private String methodName;
 
-    public static String[] QUERY_METHODS = new String[]{"config", "view", "make", "render"};
+    public static String[] QUERY_METHODS = new String[]{"config", "view", "make", "render", "send", "loadView"}; // NOI18N 
 
     @Override
     public CompletionTask createTask(int queryType, JTextComponent component) {
@@ -60,13 +61,15 @@ public CompletionTask createTask(int queryType, JTextComponent component) {
         if (reference != null) {
             AsyncCompletionQuery completionQuery;
 
-            switch (methodName) { 
+            switch (methodName) {
                 case "config": // NOI18N
                     completionQuery = new ConfigurationCompletionQuery(module);
                     break;
                 case "view": // NOI18N
                 case "make": // NOI18N
                 case "render": // NOI18N
+                case "send": // NOI18N
+                case "loadView": // NOI18N 
                     completionQuery = new ViewCompletionQuery(module);
                     break;
                 default:
@@ -156,8 +159,7 @@ protected void query(CompletionResultSet resultSet, Document doc, int caretOffse
                 if (query == null) {
                     return;
                 }
-//                ConfigurationFiles confFiles = ConfigurationFiles.getInstance(module);
-                ConfigurationFiles confFiles = null;
+                ConfigurationFiles confFiles = (ConfigurationFiles) LaravelPhpFrameworkProvider.getInstance().getConfigurationFiles2(module);
                 if (confFiles != null) {
                     confFiles.extractConfigurationMapping(false);
                     String[] queryConfigNamespace = query.split("\\.");

src/org/netbeans/modules/php/laravel/utils/PathUtils.java

@@ -94,10 +94,10 @@ public static List<FileObject> getParentChildrenFromPrefixPath(FileObject viewDi
         if (unixPath.endsWith(SLASH)) {
             //add children
 
-            list.addAll(Arrays.asList(viewDir.getChildren()));
-
             if (relativeViewRoot != null) {
                 list.addAll(Arrays.asList(relativeViewRoot.getChildren()));
+            } else {
+                list.addAll(Arrays.asList(viewDir.getChildren()));
             }
         } else {
             //filter by filename in relative context

src/org/netbeans/modules/php/laravel/utils/StringUtils.java

@@ -9,7 +9,7 @@
  */
 public class StringUtils {
     public static final String SG_QUOTE = "'"; // NOI18N
-    public static final String ESCAPED_DB_QUOTE = "\\\""; // NOI18N
+    public static final String ESCAPED_DB_QUOTE = "\""; // NOI18N
     public static String implode(Collection<String> items, String delimiter) {
         Parameters.notNull("items", items);
         Parameters.notNull("delimiter", delimiter);