You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by tm...@apache.org on 2020/11/20 19:05:24 UTC

[netbeans] branch master updated: [NETBEANS-5028] PHP - improved display of constant in code completion

This is an automated email from the ASF dual-hosted git repository.

tmysik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new c36a4fa  [NETBEANS-5028] PHP - improved display of constant in code completion
     new 96a7656  Merge pull request #2536 from KacerCZ/netbeans-5028-array-constant-completion
c36a4fa is described below

commit c36a4fa5aecdc9ba12ab09f2d680b8220daf9341
Author: Tomas Prochazka <ka...@razdva.cz>
AuthorDate: Sat Nov 14 22:39:52 2020 +0100

    [NETBEANS-5028] PHP - improved display of constant in code completion
    
    https://issues.apache.org/jira/browse/NETBEANS-5028
    
    Improves display of array constant in code completion.
    Uses short array format, displays first item in array, indicates more elements in array.
---
 .../model/nodes/ConstantDeclarationInfo.java       | 60 +++++++++++++++++++++-
 ...stSpreadOperatorInArrayExpression_02.completion | 16 +++---
 ...tSpreadOperatorInArrayExpression_02a.completion | 16 +++---
 ...stSpreadOperatorInArrayExpression_03.completion | 16 +++---
 ...stSpreadOperatorInArrayExpression_04.completion | 16 +++---
 ...atorInArrayExpression_GlobalConst_01.completion | 16 +++---
 ...atorInArrayExpression_GlobalConst_02.completion | 16 +++---
 ...atorInArrayExpression_GlobalConst_03.completion | 14 ++---
 ...atorInArrayExpression_GlobalConst_05.completion |  2 +-
 ...atorInArrayExpression_GlobalConst_09.completion | 16 +++---
 10 files changed, 123 insertions(+), 65 deletions(-)

diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/model/nodes/ConstantDeclarationInfo.java b/php/php.editor/src/org/netbeans/modules/php/editor/model/nodes/ConstantDeclarationInfo.java
index 3913bdf..a8246d9 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/model/nodes/ConstantDeclarationInfo.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/model/nodes/ConstantDeclarationInfo.java
@@ -16,12 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.netbeans.modules.php.editor.model.nodes;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.netbeans.api.annotations.common.CheckForNull;
 import org.netbeans.modules.php.editor.model.nodes.ASTNodeInfo.Kind;
+import org.netbeans.modules.php.editor.parser.astnodes.ArrayCreation;
+import org.netbeans.modules.php.editor.parser.astnodes.ArrayElement;
 import org.netbeans.modules.php.editor.parser.astnodes.ConstantDeclaration;
 import org.netbeans.modules.php.editor.parser.astnodes.Expression;
 import org.netbeans.modules.php.editor.parser.astnodes.Identifier;
@@ -32,6 +34,7 @@ import org.netbeans.modules.php.editor.parser.astnodes.UnaryOperation;
  * @author Radek Matous
  */
 public class ConstantDeclarationInfo extends ClassConstantDeclarationInfo {
+
     ConstantDeclarationInfo(final Identifier node, final String value, final ConstantDeclaration constantDeclaration) {
         super(node, value, constantDeclaration);
     }
@@ -42,6 +45,11 @@ public class ConstantDeclarationInfo extends ClassConstantDeclarationInfo {
         for (Identifier identifier : names) {
             String value = null;
             for (final Expression expression : constantDeclaration.getInitializers()) {
+                value = getConstantValue(expression);
+                if (value != null) {
+                    break;
+                }
+                /*
                 if (expression instanceof Scalar) {
                     value = ((Scalar) expression).getStringValue();
                     break;
@@ -54,6 +62,7 @@ public class ConstantDeclarationInfo extends ClassConstantDeclarationInfo {
                         break;
                     }
                 }
+                 */
             }
             retval.add(new ConstantDeclarationInfo(identifier, value, constantDeclaration));
         }
@@ -64,4 +73,53 @@ public class ConstantDeclarationInfo extends ClassConstantDeclarationInfo {
     public Kind getKind() {
         return Kind.CONSTANT;
     }
+
+    @CheckForNull
+    private static String getConstantValue(Expression expr) {
+        if (expr instanceof Scalar) {
+            return ((Scalar) expr).getStringValue();
+        }
+        if (expr instanceof UnaryOperation) {
+            UnaryOperation up = (UnaryOperation) expr;
+            if (up.getOperator() == UnaryOperation.Operator.MINUS
+                    && up.getExpression() instanceof Scalar) {
+                return "-" + ((Scalar) up.getExpression()).getStringValue();
+            }
+        }
+        if (expr instanceof ArrayCreation) {
+            return getConstantValue((ArrayCreation) expr);
+        }
+        return null;
+    }
+
+    private static String getConstantValue(ArrayCreation expr) {
+        StringBuilder sb = new StringBuilder("["); //NOI18N
+        boolean itemAdded = false;
+        List<ArrayElement> elements = expr.getElements();
+        if (elements.size() > 0) {
+            ArrayElement firstElement = elements.get(0);
+            Expression key = firstElement.getKey();
+            if (key != null) {
+                String convertedKey = getConstantValue(key);
+                if (convertedKey != null) {
+                    sb.append(convertedKey);
+                    sb.append(" => "); //NOI18N
+                }
+            }
+            String convertedValue = getConstantValue(firstElement.getValue());
+            if (convertedValue != null) {
+                sb.append(convertedValue);
+                itemAdded = true;
+            } else {
+                // Case when element exist but value was not converted to output.
+                sb.append("..."); //NOI18N
+            }
+        }
+        if (itemAdded && elements.size() > 1) {
+            sb.append(",..."); //NOI18N
+        }
+        sb.append("]"); //NOI18N
+        return sb.toString();
+    }
+
 }
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_02.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_02.completion
index b40216e..c295a81 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_02.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_02.completion
@@ -11,14 +11,14 @@ VARIABLE   array $array1                   [PUBLIC]   spreadOperatorInArrayExpre
 VARIABLE   array $array2                   [PUBLIC]   spreadOperatorInArrayExpression.php
 VARIABLE   array $array2_a                 [PUBLIC]   spreadOperatorInArrayExpression.php
 VARIABLE   array $array3                   [PUBLIC]   spreadOperatorInArrayExpression.php
-CONSTANT   BAR_CONSTANT ?                  [PUBLIC]   Bar
-CONSTANT   CONSTANT ?                      [PUBLIC]   Foo
-CONSTANT   CONSTANT1 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT1a ?                    [PUBLIC]   Foo
-CONSTANT   CONSTANT2 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT3 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT4 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT5 ?                     [PUBLIC]   Foo
+CONSTANT   BAR_CONSTANT []                 [PUBLIC]   Bar
+CONSTANT   CONSTANT [0,...]                [PUBLIC]   Foo
+CONSTANT   CONSTANT1 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT1a [[0,...]]            [PUBLIC]   Foo
+CONSTANT   CONSTANT2 [100,...]             [PUBLIC]   Foo
+CONSTANT   CONSTANT3 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT4 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT5 [...]                 [PUBLIC]   Foo
 ------------------------------------
 VARIABLE   $GLOBALS                                   PHP Platform
 VARIABLE   $HTTP_RAW_POST_DATA                        PHP Platform
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_02a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_02a.completion
index bf8410d..914defe 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_02a.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_02a.completion
@@ -12,14 +12,14 @@ VARIABLE   array $array2                   [PUBLIC]   spreadOperatorInArrayExpre
 VARIABLE   array $array2_a                 [PUBLIC]   spreadOperatorInArrayExpression.php
 VARIABLE   array $array3                   [PUBLIC]   spreadOperatorInArrayExpression.php
 VARIABLE   array $array3_a                 [PUBLIC]   spreadOperatorInArrayExpression.php
-CONSTANT   BAR_CONSTANT ?                  [PUBLIC]   Bar
-CONSTANT   CONSTANT ?                      [PUBLIC]   Foo
-CONSTANT   CONSTANT1 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT1a ?                    [PUBLIC]   Foo
-CONSTANT   CONSTANT2 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT3 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT4 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT5 ?                     [PUBLIC]   Foo
+CONSTANT   BAR_CONSTANT []                 [PUBLIC]   Bar
+CONSTANT   CONSTANT [0,...]                [PUBLIC]   Foo
+CONSTANT   CONSTANT1 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT1a [[0,...]]            [PUBLIC]   Foo
+CONSTANT   CONSTANT2 [100,...]             [PUBLIC]   Foo
+CONSTANT   CONSTANT3 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT4 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT5 [...]                 [PUBLIC]   Foo
 ------------------------------------
 VARIABLE   $GLOBALS                                   PHP Platform
 VARIABLE   $HTTP_RAW_POST_DATA                        PHP Platform
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_03.completion
index 3f8d14b..c63a5e9 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_03.completion
@@ -13,14 +13,14 @@ VARIABLE   array $array2_a                 [PUBLIC]   spreadOperatorInArrayExpre
 VARIABLE   array $array3                   [PUBLIC]   spreadOperatorInArrayExpression.php
 VARIABLE   array $array3_a                 [PUBLIC]   spreadOperatorInArrayExpression.php
 VARIABLE   array $array4                   [PUBLIC]   spreadOperatorInArrayExpression.php
-CONSTANT   BAR_CONSTANT ?                  [PUBLIC]   Bar
-CONSTANT   CONSTANT ?                      [PUBLIC]   Foo
-CONSTANT   CONSTANT1 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT1a ?                    [PUBLIC]   Foo
-CONSTANT   CONSTANT2 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT3 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT4 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT5 ?                     [PUBLIC]   Foo
+CONSTANT   BAR_CONSTANT []                 [PUBLIC]   Bar
+CONSTANT   CONSTANT [0,...]                [PUBLIC]   Foo
+CONSTANT   CONSTANT1 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT1a [[0,...]]            [PUBLIC]   Foo
+CONSTANT   CONSTANT2 [100,...]             [PUBLIC]   Foo
+CONSTANT   CONSTANT3 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT4 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT5 [...]                 [PUBLIC]   Foo
 ------------------------------------
 VARIABLE   $GLOBALS                                   PHP Platform
 VARIABLE   $HTTP_RAW_POST_DATA                        PHP Platform
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_04.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_04.completion
index 199fcf9..3907fdc 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_04.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_04.completion
@@ -13,14 +13,14 @@ VARIABLE   array $array2_a                 [PUBLIC]   spreadOperatorInArrayExpre
 VARIABLE   array $array3                   [PUBLIC]   spreadOperatorInArrayExpression.php
 VARIABLE   array $array3_a                 [PUBLIC]   spreadOperatorInArrayExpression.php
 VARIABLE   array $array4                   [PUBLIC]   spreadOperatorInArrayExpression.php
-CONSTANT   BAR_CONSTANT ?                  [PUBLIC]   Bar
-CONSTANT   CONSTANT ?                      [PUBLIC]   Foo
-CONSTANT   CONSTANT1 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT1a ?                    [PUBLIC]   Foo
-CONSTANT   CONSTANT2 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT3 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT4 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT5 ?                     [PUBLIC]   Foo
+CONSTANT   BAR_CONSTANT []                 [PUBLIC]   Bar
+CONSTANT   CONSTANT [0,...]                [PUBLIC]   Foo
+CONSTANT   CONSTANT1 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT1a [[0,...]]            [PUBLIC]   Foo
+CONSTANT   CONSTANT2 [100,...]             [PUBLIC]   Foo
+CONSTANT   CONSTANT3 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT4 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT5 [...]                 [PUBLIC]   Foo
 ------------------------------------
 VARIABLE   $GLOBALS                                   PHP Platform
 VARIABLE   $HTTP_RAW_POST_DATA                        PHP Platform
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_01.completion
index 9a5f105..7b09d8f 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_01.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_01.completion
@@ -4,13 +4,13 @@ const CONSTANT1 = [...|CONSTANT];
 PACKAGE    Bar                             [PUBLIC]   null
 PACKAGE    Foo                             [PUBLIC]   null
 CLASS      Qux                             [PUBLIC]   Bar
-CONSTANT   BAR_CONSTANT ?                  [PUBLIC]   Bar
-CONSTANT   CONSTANT ?                      [PUBLIC]   Foo
-CONSTANT   CONSTANT1 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT1a ?                    [PUBLIC]   Foo
-CONSTANT   CONSTANT2 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT3 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT4 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT5 ?                     [PUBLIC]   Foo
+CONSTANT   BAR_CONSTANT []                 [PUBLIC]   Bar
+CONSTANT   CONSTANT [0,...]                [PUBLIC]   Foo
+CONSTANT   CONSTANT1 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT1a [[0,...]]            [PUBLIC]   Foo
+CONSTANT   CONSTANT2 [100,...]             [PUBLIC]   Foo
+CONSTANT   CONSTANT3 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT4 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT5 [...]                 [PUBLIC]   Foo
 ------------------------------------
 KEYWORD    array                                      null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_02.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_02.completion
index 5b828cd..36c0403 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_02.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_02.completion
@@ -4,13 +4,13 @@ const CONSTANT2 = [100, ...CONSTANT, ...|CONSTANT1,];
 PACKAGE    Bar                             [PUBLIC]   null
 PACKAGE    Foo                             [PUBLIC]   null
 CLASS      Qux                             [PUBLIC]   Bar
-CONSTANT   BAR_CONSTANT ?                  [PUBLIC]   Bar
-CONSTANT   CONSTANT ?                      [PUBLIC]   Foo
-CONSTANT   CONSTANT1 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT1a ?                    [PUBLIC]   Foo
-CONSTANT   CONSTANT2 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT3 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT4 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT5 ?                     [PUBLIC]   Foo
+CONSTANT   BAR_CONSTANT []                 [PUBLIC]   Bar
+CONSTANT   CONSTANT [0,...]                [PUBLIC]   Foo
+CONSTANT   CONSTANT1 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT1a [[0,...]]            [PUBLIC]   Foo
+CONSTANT   CONSTANT2 [100,...]             [PUBLIC]   Foo
+CONSTANT   CONSTANT3 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT4 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT5 [...]                 [PUBLIC]   Foo
 ------------------------------------
 KEYWORD    array                                      null
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_03.completion
index c81e59b..f22e2db 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_03.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_03.completion
@@ -1,10 +1,10 @@
 Code completion result for source line:
 const CONSTANT3 = [...CONSTANT2, 100 => 0, ...CONSTANT|];
 (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
-CONSTANT   CONSTANT ?                      [PUBLIC]   Foo
-CONSTANT   CONSTANT1 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT1a ?                    [PUBLIC]   Foo
-CONSTANT   CONSTANT2 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT3 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT4 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT5 ?                     [PUBLIC]   Foo
+CONSTANT   CONSTANT [0,...]                [PUBLIC]   Foo
+CONSTANT   CONSTANT1 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT1a [[0,...]]            [PUBLIC]   Foo
+CONSTANT   CONSTANT2 [100,...]             [PUBLIC]   Foo
+CONSTANT   CONSTANT3 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT4 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT5 [...]                 [PUBLIC]   Foo
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_05.completion
index 9b132f9..1d7dbfe 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_05.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_05.completion
@@ -2,4 +2,4 @@ Code completion result for source line:
 const CONSTANT4 = [...CONSTANT2, 100 => 0, ...\Bar\|BAR_CONSTANT];
 (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
 CLASS      Qux                             [PUBLIC]   Bar
-CONSTANT   BAR_CONSTANT ?                  [PUBLIC]   Bar
+CONSTANT   BAR_CONSTANT []                 [PUBLIC]   Bar
diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_09.completion
index 6bf2c04..cdaffd9 100644
--- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_09.completion
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testSpreadOperatorInArrayExpression/spreadOperatorInArrayExpression.php.testSpreadOperatorInArrayExpression_GlobalConst_09.completion
@@ -4,13 +4,13 @@ const BAR_CONSTANT = |[];
 PACKAGE    Bar                             [PUBLIC]   null
 PACKAGE    Foo                             [PUBLIC]   null
 CLASS      Qux                             [PUBLIC]   Bar
-CONSTANT   BAR_CONSTANT ?                  [PUBLIC]   Bar
-CONSTANT   CONSTANT ?                      [PUBLIC]   Foo
-CONSTANT   CONSTANT1 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT1a ?                    [PUBLIC]   Foo
-CONSTANT   CONSTANT2 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT3 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT4 ?                     [PUBLIC]   Foo
-CONSTANT   CONSTANT5 ?                     [PUBLIC]   Foo
+CONSTANT   BAR_CONSTANT []                 [PUBLIC]   Bar
+CONSTANT   CONSTANT [0,...]                [PUBLIC]   Foo
+CONSTANT   CONSTANT1 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT1a [[0,...]]            [PUBLIC]   Foo
+CONSTANT   CONSTANT2 [100,...]             [PUBLIC]   Foo
+CONSTANT   CONSTANT3 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT4 [...]                 [PUBLIC]   Foo
+CONSTANT   CONSTANT5 [...]                 [PUBLIC]   Foo
 ------------------------------------
 KEYWORD    array                                      null


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists