diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java b/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java index 04baf20e79b9..2a03b1eba27c 100644 --- a/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java +++ b/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Collections; import java.util.EnumSet; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -179,6 +180,15 @@ final class CompletionContextFinder { new Object[]{PHPTokenId.PHP_PUBLIC}, new Object[]{PHPTokenId.PHP_PUBLIC, PHPTokenId.WHITESPACE}, new Object[]{PHPTokenId.PHP_PUBLIC, PHPTokenId.WHITESPACE, PHPTokenId.PHP_STRING}, + new Object[]{PHPTokenId.PHP_PRIVATE_SET}, + new Object[]{PHPTokenId.PHP_PRIVATE_SET, PHPTokenId.WHITESPACE}, + new Object[]{PHPTokenId.PHP_PRIVATE_SET, PHPTokenId.WHITESPACE, PHPTokenId.PHP_STRING}, + new Object[]{PHPTokenId.PHP_PROTECTED_SET}, + new Object[]{PHPTokenId.PHP_PROTECTED_SET, PHPTokenId.WHITESPACE}, + new Object[]{PHPTokenId.PHP_PROTECTED_SET, PHPTokenId.WHITESPACE, PHPTokenId.PHP_STRING}, + new Object[]{PHPTokenId.PHP_PUBLIC_SET}, + new Object[]{PHPTokenId.PHP_PUBLIC_SET, PHPTokenId.WHITESPACE}, + new Object[]{PHPTokenId.PHP_PUBLIC_SET, PHPTokenId.WHITESPACE, PHPTokenId.PHP_STRING}, new Object[]{PHPTokenId.PHP_STATIC}, new Object[]{PHPTokenId.PHP_STATIC, PHPTokenId.WHITESPACE}, new Object[]{PHPTokenId.PHP_STATIC, PHPTokenId.WHITESPACE, PHPTokenId.PHP_STRING}, @@ -228,6 +238,36 @@ final class CompletionContextFinder { new Object[]{PHPTokenId.PHP_VARIABLE, PHPTokenId.PHP_TOKEN}); private static final List SERVER_ARRAY_TOKENTEXTS = Arrays.asList(new String[]{"$_SERVER", "["}); //NOI18N + private static final Set BUILT_IN_TYPES = new HashSet<>(Arrays.asList( + PHPTokenId.PHP_TYPE_BOOL, + PHPTokenId.PHP_TYPE_FLOAT, + PHPTokenId.PHP_TYPE_INT, + PHPTokenId.PHP_TYPE_STRING, + PHPTokenId.PHP_TYPE_VOID, + PHPTokenId.PHP_TYPE_NEVER, + PHPTokenId.PHP_TYPE_OBJECT, + PHPTokenId.PHP_TYPE_MIXED, + PHPTokenId.PHP_SELF, + PHPTokenId.PHP_PARENT, + PHPTokenId.PHP_STATIC, + PHPTokenId.PHP_NULL, + PHPTokenId.PHP_FALSE, + PHPTokenId.PHP_TRUE, + PHPTokenId.PHP_ARRAY, + PHPTokenId.PHP_ITERABLE, + PHPTokenId.PHP_CALLABLE + )); + private static final Set FIELD_MODIFIERS = new HashSet<>(Arrays.asList( + PHPTokenId.PHP_PUBLIC, PHPTokenId.PHP_PROTECTED, PHPTokenId.PHP_PRIVATE, + PHPTokenId.PHP_PUBLIC_SET, PHPTokenId.PHP_PROTECTED_SET, PHPTokenId.PHP_PRIVATE_SET, + PHPTokenId.PHP_STATIC, PHPTokenId.PHP_READONLY, PHPTokenId.PHP_FINAL, PHPTokenId.PHP_VAR + )); + private static final Set VISIBILITY_MODIFIERS = new HashSet<>(Arrays.asList( + PHPTokenId.PHP_PUBLIC, PHPTokenId.PHP_PROTECTED, PHPTokenId.PHP_PRIVATE + )); + private static final Set SET_VISIBILITY_MODIFIERS = new HashSet<>(Arrays.asList( + PHPTokenId.PHP_PUBLIC_SET, PHPTokenId.PHP_PROTECTED_SET, PHPTokenId.PHP_PRIVATE_SET + )); public static enum CompletionContext { @@ -434,19 +474,19 @@ && acceptTokenChainTexts(tokenSequence, SERVER_ARRAY_TOKENTEXTS)) { return CompletionContext.EXPRESSION; } - private static boolean isPhpDocToken(TokenSequence tokenSequence) { + private static boolean isPhpDocToken(TokenSequence tokenSequence) { return isOneOfTokens(tokenSequence, PHPDOC_TOKENS); } - private static boolean isCommonCommentToken(TokenSequence tokenSequence) { + private static boolean isCommonCommentToken(TokenSequence tokenSequence) { return isOneOfTokens(tokenSequence, COMMENT_TOKENS); } - private static boolean isCommentToken(TokenSequence tokenSequence) { + private static boolean isCommentToken(TokenSequence tokenSequence) { return isCommonCommentToken(tokenSequence) || isPhpDocToken(tokenSequence); } - private static boolean isOneOfTokens(TokenSequence tokenSequence, PHPTokenId[] tokenIds) { + private static boolean isOneOfTokens(TokenSequence tokenSequence, PHPTokenId[] tokenIds) { TokenId searchedId = tokenSequence.token().id(); for (TokenId tokenId : tokenIds) { @@ -458,7 +498,7 @@ private static boolean isOneOfTokens(TokenSequence tokenSequence, PHPTokenId[] t return false; } - private static boolean isEachOfTokens(Token[] tokens, PHPTokenId[] tokenIds) { + private static boolean isEachOfTokens(Token[] tokens, PHPTokenId[] tokenIds) { Set set = EnumSet.noneOf(PHPTokenId.class); for (Token token : tokens) { TokenId searchedId = token.id(); @@ -471,7 +511,7 @@ private static boolean isEachOfTokens(Token[] tokens, PHPTokenId[] tokenIds) { return set.size() == tokenIds.length; } - private static boolean acceptTokenChainTexts(TokenSequence tokenSequence, List tokenTexts) { + private static boolean acceptTokenChainTexts(TokenSequence tokenSequence, List tokenTexts) { int orgTokenSequencePos = tokenSequence.offset(); boolean accept = true; boolean moreTokens = tokenSequence.movePrevious(); @@ -498,7 +538,7 @@ private static boolean acceptTokenChainTexts(TokenSequence tokenSequence, List tokenIdChains, boolean movePrevious) { + private static boolean acceptTokenChains(TokenSequence tokenSequence, List tokenIdChains, boolean movePrevious) { for (Object[] tokenIDChain : tokenIdChains) { if (acceptTokenChain(tokenSequence, tokenIDChain, movePrevious)) { return true; @@ -508,7 +548,7 @@ private static boolean acceptTokenChains(TokenSequence tokenSequence, List tokenSequence, Object[] tokenIdChain, boolean movePrevious) { int orgTokenSequencePos = tokenSequence.offset(); boolean accept = true; boolean moreTokens = movePrevious ? tokenSequence.movePrevious() : true; @@ -634,7 +674,7 @@ private static boolean consumeNameSpace(TokenSequence tokenSequence) { return hadNSSeparator; } - private static boolean consumeComment(TokenSequence tokenSequence) { + private static boolean consumeComment(TokenSequence tokenSequence) { while (tokenSequence.token().id() == PHPTokenId.PHP_COMMENT_START || tokenSequence.token().id() == PHPTokenId.PHP_COMMENT_END || tokenSequence.token().id() == PHPTokenId.PHP_COMMENT) { @@ -645,7 +685,7 @@ private static boolean consumeComment(TokenSequence tokenSequence) { return true; } - private static boolean consumeClassesConstFunctionInGroupUse(TokenSequence tokenSequence) { + private static boolean consumeClassesConstFunctionInGroupUse(TokenSequence tokenSequence) { if (tokenSequence.token().id() != PHPTokenId.PHP_CURLY_OPEN && tokenSequence.token().id() != PHPTokenId.PHP_TOKEN && tokenSequence.token().id() != PHPTokenId.PHP_CONST @@ -684,7 +724,7 @@ private static boolean consumeClassesConstFunctionInGroupUse(TokenSequence token return hasCurlyOpen; } - private static boolean consumeFieldDeclaredTypes(TokenSequence tokenSequence) { + private static boolean consumeFieldDeclaredTypes(TokenSequence tokenSequence) { if (!isTypeSeparator(tokenSequence.token()) && tokenSequence.token().id() != PHPTokenId.WHITESPACE && tokenSequence.token().id() != PHPTokenId.PHP_STRING @@ -713,7 +753,7 @@ private static boolean consumeFieldDeclaredTypes(TokenSequence tokenSequence) { return isFieldType; } - private static boolean consumeConstDeclaredTypes(TokenSequence tokenSequence) { + private static boolean consumeConstDeclaredTypes(TokenSequence tokenSequence) { if (!isTypeSeparator(tokenSequence.token()) // |&() && tokenSequence.token().id() != PHPTokenId.WHITESPACE && tokenSequence.token().id() != PHPTokenId.PHP_STRING @@ -724,7 +764,7 @@ private static boolean consumeConstDeclaredTypes(TokenSequence tokenSequence) { } boolean isConstType = false; TokenId lastTokenId = null; - Token lastTokenExceptForWS = null; + Token lastTokenExceptForWS = null; do { if (lastTokenId == PHPTokenId.WHITESPACE) { if (!isTypeSeparator(tokenSequence.token()) @@ -762,7 +802,7 @@ private static boolean isTypeSeparator(Token token) { || isRightParen(token); } - private static boolean consumeMultiCatchExceptions(TokenSequence tokenSequence) { + private static boolean consumeMultiCatchExceptions(TokenSequence tokenSequence) { if (tokenSequence.token().id() != PHPTokenId.PHP_OPERATOR && tokenSequence.token().id() != PHPTokenId.PHP_TOKEN && tokenSequence.token().id() != PHPTokenId.WHITESPACE @@ -800,7 +840,7 @@ private static boolean consumeMultiCatchExceptions(TokenSequence tokenSequence) return hasParenOpen; } - private static boolean consumeClassesInCombinedUse(TokenSequence tokenSequence) { + private static boolean consumeClassesInCombinedUse(TokenSequence tokenSequence) { boolean hasCommaDelimiter = false; if (tokenSequence.token().id() != PHPTokenId.PHP_TOKEN && tokenSequence.token().id() != PHPTokenId.WHITESPACE @@ -825,7 +865,7 @@ private static boolean consumeClassesInCombinedUse(TokenSequence tokenSequence) return hasCommaDelimiter; } - private static boolean consumeUntilTypeKeyword(TokenSequence tokenSequence) { + private static boolean consumeUntilTypeKeyword(TokenSequence tokenSequence) { boolean result = false; do { if (tokenSequence.token().id() == PHPTokenId.PHP_CLASS || tokenSequence.token().id() == PHPTokenId.PHP_INTERFACE @@ -842,7 +882,7 @@ private static boolean consumeUntilTypeKeyword(TokenSequence tokenSequence) { return result; } - private static boolean consumeUntilConstEqual(TokenSequence tokenSequence) { + private static boolean consumeUntilConstEqual(TokenSequence tokenSequence) { boolean hasEqual = false; do { if (tokenSequence.token().id() == PHPTokenId.PHP_CONST @@ -859,7 +899,7 @@ private static boolean consumeUntilConstEqual(TokenSequence tokenSequence) { return hasEqual; } - private static boolean consumeUntilEnumCaseEqual(TokenSequence tokenSequence) { + private static boolean consumeUntilEnumCaseEqual(TokenSequence tokenSequence) { boolean hasEqual = false; do { if (tokenSequence.token().id() == PHPTokenId.PHP_CASE @@ -876,7 +916,7 @@ private static boolean consumeUntilEnumCaseEqual(TokenSequence tokenSequence) { return hasEqual; } - private static boolean consumeObjectOperator(TokenSequence tokenSequence) { + private static boolean consumeObjectOperator(TokenSequence tokenSequence) { boolean result = false; do { if (isObjectOperatorToken(tokenSequence.token())) { @@ -890,19 +930,19 @@ private static boolean consumeObjectOperator(TokenSequence tokenSequence) { return result; } - private static Token[] getLeftPreceedingTokens(TokenSequence tokenSequence) { - Token[] preceedingTokens = getPreceedingTokens(tokenSequence); + private static Token[] getLeftPreceedingTokens(TokenSequence tokenSequence) { + Token[] preceedingTokens = getPreceedingTokens(tokenSequence); if (preceedingTokens.length == 0) { return preceedingTokens; } - Token[] leftPreceedingTokens = new Token[preceedingTokens.length - 1]; + Token[] leftPreceedingTokens = new Token[preceedingTokens.length - 1]; System.arraycopy(preceedingTokens, 1, leftPreceedingTokens, 0, leftPreceedingTokens.length); return leftPreceedingTokens; } - private static Token[] getPreceedingTokens(TokenSequence tokenSequence) { + private static Token[] getPreceedingTokens(TokenSequence tokenSequence) { int orgOffset = tokenSequence.offset(); - LinkedList tokens = new LinkedList<>(); + LinkedList> tokens = new LinkedList<>(); boolean success = true; @@ -1121,6 +1161,7 @@ private static CompletionContext getParamaterContext(Token token, in || isOrOperator(cToken) || isAndOperator(cToken) || isVisibilityModifier(cToken) + || isSetVisibilityModifier(cToken) || isReadonlyModifier(cToken)) { if (isReference(cToken)) { int origOffset = tokenSequence.offset(); @@ -1145,6 +1186,8 @@ private static CompletionContext getParamaterContext(Token token, in } if (isVisibilityModifier(token) || isVisibilityModifier(cToken) + || isSetVisibilityModifier(token) + || isSetVisibilityModifier(cToken) || isReadonlyModifier(token) || isReadonlyModifier(cToken)) { contextForSeparator = CompletionContext.VISIBILITY_MODIFIER_OR_TYPE_NAME; @@ -1312,18 +1355,15 @@ private static boolean isAcceptedPrefix(Token token) { } private static boolean isFieldModifier(Token token) { - return token.id() == PHPTokenId.PHP_PRIVATE - || token.id() == PHPTokenId.PHP_PROTECTED - || token.id() == PHPTokenId.PHP_PUBLIC - || token.id() == PHPTokenId.PHP_STATIC - || token.id() == PHPTokenId.PHP_READONLY - || token.id() == PHPTokenId.PHP_VAR; + return FIELD_MODIFIERS.contains(token.id()); } private static boolean isVisibilityModifier(Token token) { - return token.id() == PHPTokenId.PHP_PRIVATE - || token.id() == PHPTokenId.PHP_PROTECTED - || token.id() == PHPTokenId.PHP_PUBLIC; + return VISIBILITY_MODIFIERS.contains(token.id()); + } + + private static boolean isSetVisibilityModifier(Token token) { + return SET_VISIBILITY_MODIFIERS.contains(token.id()); } private static boolean isReadonlyModifier(Token token) { @@ -1336,24 +1376,7 @@ private static boolean isConstructor(Token token) { } private static boolean isType(Token token) { - PHPTokenId id = token.id(); - return id == PHPTokenId.PHP_TYPE_BOOL - || id == PHPTokenId.PHP_TYPE_FLOAT - || id == PHPTokenId.PHP_TYPE_INT - || id == PHPTokenId.PHP_TYPE_STRING - || id == PHPTokenId.PHP_TYPE_VOID - || id == PHPTokenId.PHP_TYPE_NEVER - || id == PHPTokenId.PHP_TYPE_OBJECT - || id == PHPTokenId.PHP_TYPE_MIXED - || id == PHPTokenId.PHP_SELF - || id == PHPTokenId.PHP_PARENT - || id == PHPTokenId.PHP_STATIC - || id == PHPTokenId.PHP_NULL - || id == PHPTokenId.PHP_FALSE - || id == PHPTokenId.PHP_TRUE - || id == PHPTokenId.PHP_ARRAY - || id == PHPTokenId.PHP_ITERABLE - || id == PHPTokenId.PHP_CALLABLE; + return BUILT_IN_TYPES.contains(token.id()); } static boolean isComma(Token token) { @@ -1426,7 +1449,7 @@ private static List> getPreceedingLineTokens(Token

tokenSequence) { boolean retval = false; List nodePath = NavUtils.underCaret(info, lexerToASTOffset(info, caretOffset)); int nodesCount = nodePath.size(); @@ -1448,13 +1471,13 @@ private static synchronized boolean isInsideInterfaceDeclarationBlock(final Pars return retval; } - private static synchronized boolean isUnderInterfaceTokenId(final TokenSequence tokenSequence) { + private static synchronized boolean isUnderInterfaceTokenId(final TokenSequence tokenSequence) { boolean retval = false; int curlyBalance = -1; int orgOffset = tokenSequence.offset(); try { while (tokenSequence.movePrevious()) { - Token token = tokenSequence.token(); + Token token = tokenSequence.token(); TokenId id = token.id(); if (id.equals(PHPTokenId.PHP_INTERFACE) && curlyBalance == 0) { retval = true; @@ -1480,7 +1503,7 @@ private static synchronized boolean isUnderInterfaceTokenId(final TokenSequence } private static synchronized boolean isInsideClassOrTraitOrEnumDeclarationBlock(ParserResult info, - int caretOffset, TokenSequence tokenSequence) { + int caretOffset, TokenSequence tokenSequence) { List nodePath = NavUtils.underCaret(info, lexerToASTOffset(info, caretOffset)); boolean methDecl = false; boolean funcDecl = false; @@ -1530,7 +1553,7 @@ public void visit(ASTError astError) { int curlyOpen = 0; int curlyClose = 0; while (tokenSequence.movePrevious()) { - Token token = tokenSequence.token(); + Token token = tokenSequence.token(); TokenId id = token.id(); if (id.equals(PHPTokenId.PHP_CURLY_OPEN)) { curlyOpen++; @@ -1639,7 +1662,7 @@ private static CompletionContext getNamedArgumentsContext(final int caretOffset, return retval; } - private static boolean isInMatchExpression(final int caretOffset, final TokenSequence ts) { + private static boolean isInMatchExpression(final int caretOffset, final TokenSequence ts) { int originalOffset = ts.offset(); boolean result = false; ts.move(caretOffset); @@ -1661,7 +1684,7 @@ private static boolean isInMatchExpression(final int caretOffset, final TokenSeq return result; } - static boolean isInAttribute(final int caretOffset, final TokenSequence ts, boolean allowInArgs) { + static boolean isInAttribute(final int caretOffset, final TokenSequence ts, boolean allowInArgs) { final int originalOffset = ts.offset(); // e.g. #[MyAttr^ibute] ("^": caret) boolean result = false; @@ -1690,7 +1713,9 @@ static boolean isInAttribute(final int caretOffset, final TokenSequence ts, bool } if (tokenId == PHPTokenId.PHP_SEMICOLON || isFunctionDeclaration(ts.token()) - || isVisibilityModifier(ts.token())) { + || isVisibilityModifier(ts.token()) + || isSetVisibilityModifier(ts.token()) + ) { break; } } diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java b/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java index 5723150fb008..91c8d70eda8e 100644 --- a/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java +++ b/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java @@ -123,6 +123,7 @@ import org.netbeans.modules.php.editor.parser.astnodes.ClassInstanceCreation; import org.netbeans.modules.php.editor.parser.astnodes.EnumDeclaration; import org.netbeans.modules.php.editor.parser.astnodes.Expression; +import org.netbeans.modules.php.editor.parser.astnodes.InterfaceDeclaration; import org.netbeans.modules.php.editor.parser.astnodes.NamespaceName; import org.netbeans.modules.php.editor.parser.astnodes.TraitDeclaration; import org.netbeans.modules.php.editor.parser.astnodes.TypeDeclaration; @@ -168,6 +169,12 @@ private static enum UseType { PHP_KEYWORDS.put("public", KeywordCompletionType.ENDS_WITH_SPACE); //NOI18N PHP_KEYWORDS.put("private", KeywordCompletionType.ENDS_WITH_SPACE); //NOI18N PHP_KEYWORDS.put("protected", KeywordCompletionType.ENDS_WITH_SPACE); //NOI18N + PHP_KEYWORDS.put("public(set)", KeywordCompletionType.ENDS_WITH_SPACE); //NOI18N + PHP_KEYWORDS.put("private(set)", KeywordCompletionType.ENDS_WITH_SPACE); //NOI18N + PHP_KEYWORDS.put("protected(set)", KeywordCompletionType.ENDS_WITH_SPACE); //NOI18N + PHP_KEYWORDS.put("public protected(set)", KeywordCompletionType.ENDS_WITH_SPACE); //NOI18N + PHP_KEYWORDS.put("public private(set)", KeywordCompletionType.ENDS_WITH_SPACE); //NOI18N + PHP_KEYWORDS.put("protected private(set)", KeywordCompletionType.ENDS_WITH_SPACE); //NOI18N PHP_KEYWORDS.put("abstract", KeywordCompletionType.ENDS_WITH_SPACE); //NOI18N PHP_KEYWORDS.put("readonly", KeywordCompletionType.ENDS_WITH_SPACE); //NOI18N PHP_KEYWORDS.put("clone", KeywordCompletionType.ENDS_WITH_SPACE); //NOI18N @@ -256,6 +263,16 @@ private static enum UseType { "protected", // NOI18N "private" // NOI18N ); + private static final List PHP_SET_VISIBILITY_KEYWORDS = Arrays.asList( + "public(set)", // NOI18N + "protected(set)", // NOI18N + "private(set)" // NOI18N + ); + private static final List PHP_ASYMMETRIC_VISIBILITY_KEYWORDS = Arrays.asList( + "public private(set)", // NOI18N + "public protected(set)", // NOI18N + "protected private(set)" // NOI18N + ); private static final Collection AUTOPOPUP_STOP_CHARS = new TreeSet<>( Arrays.asList('=', ';', '+', '-', '*', '/', '%', '(', ')', '[', ']', '{', '}', '?')); @@ -265,9 +282,11 @@ private static enum UseType { Arrays.asList(new String[]{"__construct", "__destruct", "__call", "__callStatic", "__clone", "__get", "__invoke", "__isset", "__set", "__set_state", "__sleep", "__toString", "__unset", "__wakeup"}); //NOI18N - private static final List CLASS_CONTEXT_KEYWORD_PROPOSAL = - Arrays.asList(new String[]{"abstract", "const", "function", "private", "final", - "protected", "public", "static", "var", "readonly"}); //NOI18N + private static final List CLASS_CONTEXT_KEYWORD_PROPOSAL = Arrays.asList( + "abstract", "const", "function", "final", // NOI18N + "private", "protected", "public", // NOI18N + "static", "var", "readonly" // NOI18N + ); private static final List INTERFACE_CONTEXT_KEYWORD_PROPOSAL = Arrays.asList(new String[]{"const", "function", "public", "static"}); //NOI18N private static final List INHERITANCE_KEYWORDS = @@ -557,6 +576,7 @@ public CodeCompletionResult complete(CodeCompletionContext completionContext) { break; case VISIBILITY_MODIFIER_OR_TYPE_NAME: // no break autoCompleteKeywords(completionResult, request, PHP_VISIBILITY_KEYWORDS); + autoCompleteKeywords(completionResult, request, PHP_SET_VISIBILITY_KEYWORDS); autoCompleteKeywords(completionResult, request, Arrays.asList("readonly")); // NOI18N case TYPE_NAME: autoCompleteNamespaces(completionResult, request); @@ -1301,7 +1321,30 @@ private void autoCompleteInClassContext( TokenSequence tokenSequence = th.tokenSequence(PHPTokenId.language()); assert tokenSequence != null; + boolean foundFunction = false; + boolean foundConst = false; + tokenSequence.move(caretOffset); + while (tokenSequence.moveNext()) { + Token token = tokenSequence.token(); + if (token.id() == PHPTokenId.PHP_LINE_COMMENT + || TokenUtilities.indexOf(token.text(), '\n') != -1) { + break; + } + if (token.id() == PHPTokenId.PHP_FUNCTION) { + foundFunction = true; + break; + } + if (token.id() == PHPTokenId.PHP_CONST) { + foundConst = true; + break; + } + } + autoCompleteKeywords(completionResult, request, CLASS_CONTEXT_KEYWORD_PROPOSAL); + if (!foundConst && !foundFunction) { + autoCompleteKeywords(completionResult, request, PHP_SET_VISIBILITY_KEYWORDS); + autoCompleteKeywords(completionResult, request, PHP_ASYMMETRIC_VISIBILITY_KEYWORDS); + } if (offerMagicAndInherited(tokenSequence, caretOffset, th)) { EnclosingClass enclosingClass = findEnclosingClass(info, lexerToASTOffset(info, caretOffset)); if (enclosingClass != null) { @@ -1387,15 +1430,24 @@ private void autoCompleteFieldType(ParserResult info, int caretOffset, final PHP TokenSequence tokenSequence = th.tokenSequence(PHPTokenId.language()); assert tokenSequence != null; tokenSequence.move(caretOffset); + boolean addFinalKeyword = false; boolean addStaticKeyword = false; boolean addReadonlyKeyword = false; boolean addVisibilityKeyword = false; + boolean addSetVisibilityKeyword = false; if (!(!tokenSequence.moveNext() && !tokenSequence.movePrevious())) { Token token = tokenSequence.token(); int tokenIdOffset = tokenSequence.token().offset(th); + addFinalKeyword = !CompletionContextFinder.lineContainsAny(token, caretOffset - tokenIdOffset, tokenSequence, Arrays.asList( + PHPTokenId.PHP_FINAL, + PHPTokenId.PHP_OPERATOR // "|" + )); addStaticKeyword = !CompletionContextFinder.lineContainsAny(token, caretOffset - tokenIdOffset, tokenSequence, Arrays.asList( PHPTokenId.PHP_STATIC, - PHPTokenId.PHP_READONLY, + PHPTokenId.PHP_READONLY, // cannot use with readonly + PHPTokenId.PHP_PUBLIC_SET, // cannot use with set visibility + PHPTokenId.PHP_PRIVATE_SET, + PHPTokenId.PHP_PROTECTED_SET, PHPTokenId.PHP_OPERATOR // "|" )); addReadonlyKeyword = !CompletionContextFinder.lineContainsAny(token, caretOffset - tokenIdOffset, tokenSequence, Arrays.asList( @@ -1408,6 +1460,16 @@ private void autoCompleteFieldType(ParserResult info, int caretOffset, final PHP PHPTokenId.PHP_PROTECTED, PHPTokenId.PHP_OPERATOR // "|" )); + addSetVisibilityKeyword = !CompletionContextFinder.lineContainsAny(token, caretOffset - tokenIdOffset, tokenSequence, Arrays.asList( + PHPTokenId.PHP_PUBLIC_SET, + PHPTokenId.PHP_PRIVATE_SET, + PHPTokenId.PHP_PROTECTED_SET, + PHPTokenId.PHP_STATIC, // cannot use with static + PHPTokenId.PHP_OPERATOR // "|" + )); + } + if (addFinalKeyword) { + keywords.add("final"); // NOI18N } if (addStaticKeyword) { keywords.add("static"); // NOI18N @@ -1418,6 +1480,12 @@ private void autoCompleteFieldType(ParserResult info, int caretOffset, final PHP if (addVisibilityKeyword) { keywords.addAll(PHP_VISIBILITY_KEYWORDS); } + if (addSetVisibilityKeyword) { + keywords.addAll(PHP_SET_VISIBILITY_KEYWORDS); + } + if (addVisibilityKeyword && addSetVisibilityKeyword) { + keywords.addAll(PHP_ASYMMETRIC_VISIBILITY_KEYWORDS); + } } if (isNullableType) { // ?false, ?true is OK since PHP 8.2 @@ -1439,6 +1507,10 @@ private boolean offerMagicAndInherited(TokenSequence tokenSequence, PHPTokenId.PHP_PRIVATE, PHPTokenId.PHP_PUBLIC, PHPTokenId.PHP_PROTECTED, + PHPTokenId.PHP_PRIVATE_SET, + PHPTokenId.PHP_PUBLIC_SET, + PHPTokenId.PHP_PROTECTED_SET, + PHPTokenId.PHP_FINAL, PHPTokenId.PHP_ABSTRACT, PHPTokenId.PHP_VAR, PHPTokenId.PHP_STATIC, @@ -2038,6 +2110,11 @@ private static boolean isInType(CompletionRequest request) { return findEnclosingType(request.info, lexerToASTOffset(request.result, request.anchor)) != null; } + private static boolean isInInterface(CompletionRequest request) { + EnclosingType enclosingType = findEnclosingType(request.info, lexerToASTOffset(request.result, request.anchor)); + return enclosingType != null && enclosingType.isInterface(); + } + @CheckForNull private static NamespaceName findNamespaceName(ParserResult info, int offset) { List nodes = NavUtils.underCaret(info, offset); @@ -2182,6 +2259,10 @@ private void autoCompleteExpression(final PHPCompletionResult completionResult, autoCompleteNamespaces(completionResult, request); List defaultKeywords = new ArrayList<>(PHP_KEYWORDS.keySet()); defaultKeywords.remove("default =>"); // NOI18N + defaultKeywords.removeAll(PHP_ASYMMETRIC_VISIBILITY_KEYWORDS); + if (isInInterface(request)) { + defaultKeywords.removeAll(PHP_SET_VISIBILITY_KEYWORDS); + } autoCompleteExpression(completionResult, request, defaultKeywords); } @@ -2801,6 +2882,8 @@ private interface EnclosingType { boolean isEnumDeclaration(); + boolean isInterface(); + String extractTypeName(); //~ Factories @@ -2822,6 +2905,11 @@ public boolean isEnumDeclaration() { return typeDeclaration instanceof EnumDeclaration; } + @Override + public boolean isInterface() { + return typeDeclaration instanceof InterfaceDeclaration; + } + @Override public String extractTypeName() { return CodeUtils.extractTypeName(typeDeclaration); @@ -2846,6 +2934,11 @@ public boolean isEnumDeclaration() { return tokenId == PHPTokenId.PHP_ENUM; } + @Override + public boolean isInterface() { + return tokenId == PHPTokenId.PHP_INTERFACE; + } + @Override public String extractTypeName() { return typeName; @@ -2871,6 +2964,11 @@ public boolean isEnumDeclaration() { return false; } + @Override + public boolean isInterface() { + return false; + } + @Override public String extractTypeName() { return CodeUtils.extractClassName(classInstanceCreation); diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/_base/insideClass.php.testInsideClass_1.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/_base/insideClass.php.testInsideClass_1.completion index 8f6588c529e8..719395bca742 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/_base/insideClass.php.testInsideClass_1.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/_base/insideClass.php.testInsideClass_1.completion @@ -3,3 +3,4 @@ priv|ate $fld = 0; (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) ------------------------------------ KEYWORD private null +KEYWORD private(set) null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/_base/insideClass3.php.testInsideClass_10.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/_base/insideClass3.php.testInsideClass_10.completion index dbf41f70328f..d68de2e76496 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/_base/insideClass3.php.testInsideClass_10.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/_base/insideClass3.php.testInsideClass_10.completion @@ -3,3 +3,4 @@ privat|e $afterDocComment = 3; (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) ------------------------------------ KEYWORD private null +KEYWORD private(set) null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/_base/issue153707.php.testIssue153707_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/_base/issue153707.php.testIssue153707_01.completion index c80246ac3391..fa46a6f40513 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/_base/issue153707.php.testIssue153707_01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/_base/issue153707.php.testIssue153707_01.completion @@ -206,8 +206,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/_base/issue153867.php.testIssue153867.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/_base/issue153867.php.testIssue153867.completion index 118fe89acd93..76f96ccc405f 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/_base/issue153867.php.testIssue153867.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/_base/issue153867.php.testIssue153867.completion @@ -197,8 +197,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefixInTrait_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefixInTrait_01.completion index bbd9a5b3efc1..7943691eb7cf 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefixInTrait_01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefixInTrait_01.completion @@ -86,8 +86,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefixInTrait_03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefixInTrait_03.completion index 6c4b62b4d589..4f3a9e4c7b13 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefixInTrait_03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefixInTrait_03.completion @@ -7,3 +7,4 @@ VARIABLE ? $protectedTraitStaticPropert [PROTECTE Trait1855 VARIABLE ? protectedTraitProperty [PROTECTE Trait1855 ------------------------------------ KEYWORD protected null +KEYWORD protected(set) null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefix_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefix_01.completion index 2e313e4c868b..26c37a93c033 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefix_01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefix_01.completion @@ -112,8 +112,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefix_03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefix_03.completion index 55b15a3b3250..b8344aadf8c3 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefix_03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/nb1855/nb1855.php.testCompleteAccessPrefix_03.completion @@ -13,3 +13,4 @@ CONSTANT PRIVATE_CONSTANT "private cons [PRIVATE] Class1855 ------------------------------------ KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes.completion index 0d07250a91a7..d7aeaaacff2d 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/netbeans68version/paramdecltypes/paramdecltypes.php.testParamDeclTypes.completion @@ -74,8 +74,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass01.php.testAnonymousClass01h.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass01.php.testAnonymousClass01h.completion index 2734133b31ae..1c1c0d9aa050 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass01.php.testAnonymousClass01h.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass01.php.testAnonymousClass01h.completion @@ -24,8 +24,14 @@ KEYWORD const null KEYWORD final null KEYWORD function null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD static null KEYWORD var null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass02.php.testAnonymousClass02a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass02.php.testAnonymousClass02a.completion index 61bf44f6e751..6d12c05d1046 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass02.php.testAnonymousClass02a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass02.php.testAnonymousClass02a.completion @@ -143,8 +143,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass02.php.testAnonymousClass02d.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass02.php.testAnonymousClass02d.completion index 3ea52d918aad..3159852afc08 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass02.php.testAnonymousClass02d.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass02.php.testAnonymousClass02d.completion @@ -143,8 +143,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass02.php.testAnonymousClass02e.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass02.php.testAnonymousClass02e.completion index 7622cc367056..ced64fc4419d 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass02.php.testAnonymousClass02e.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/anonymousClass02.php.testAnonymousClass02e.completion @@ -143,8 +143,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testBoolTypeHint03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testBoolTypeHint03.completion index 8844e169cfc5..10720dba154e 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testBoolTypeHint03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testBoolTypeHint03.completion @@ -59,8 +59,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testFloatTypeHint03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testFloatTypeHint03.completion index 121c02a6b178..24e14c40feb4 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testFloatTypeHint03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testFloatTypeHint03.completion @@ -59,8 +59,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testIntTypeHint03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testIntTypeHint03.completion index 7e9d77e14c09..b4e19825ab24 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testIntTypeHint03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testIntTypeHint03.completion @@ -59,8 +59,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testStringTypeHint03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testStringTypeHint03.completion index 63b5bdbfeda4..e64e47ceec52 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testStringTypeHint03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php70/base/scalarTypeHints.php.testStringTypeHint03.completion @@ -59,8 +59,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/fullyQualifiedName.php.testMultiCatch_FullyQualifiedName05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/fullyQualifiedName.php.testMultiCatch_FullyQualifiedName05.completion index e980d0338042..bc30d0846e80 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/fullyQualifiedName.php.testMultiCatch_FullyQualifiedName05.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/fullyQualifiedName.php.testMultiCatch_FullyQualifiedName05.completion @@ -74,8 +74,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/fullyQualifiedNameWithoutWS.php.testMultiCatch_FullyQualifiedNameWithoutWS05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/fullyQualifiedNameWithoutWS.php.testMultiCatch_FullyQualifiedNameWithoutWS05.completion index a3523eb74971..12b8a61237af 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/fullyQualifiedNameWithoutWS.php.testMultiCatch_FullyQualifiedNameWithoutWS05.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/fullyQualifiedNameWithoutWS.php.testMultiCatch_FullyQualifiedNameWithoutWS05.completion @@ -74,8 +74,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/unqualifiedName.php.testMultiCatch_UnqualifiedName03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/unqualifiedName.php.testMultiCatch_UnqualifiedName03.completion index d40c17208f3d..a291488440bf 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/unqualifiedName.php.testMultiCatch_UnqualifiedName03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/unqualifiedName.php.testMultiCatch_UnqualifiedName03.completion @@ -74,8 +74,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/unqualifiedNameWithoutWS.php.testMultiCatch_UnqualifiedNameWithoutWS03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/unqualifiedNameWithoutWS.php.testMultiCatch_UnqualifiedNameWithoutWS03.completion index d981feb41e1e..dc4465a19fee 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/unqualifiedNameWithoutWS.php.testMultiCatch_UnqualifiedNameWithoutWS03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php71/testMultiCatch/unqualifiedNameWithoutWS.php.testMultiCatch_UnqualifiedNameWithoutWS03.completion @@ -74,8 +74,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_02.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_02.completion index 7571ba773d4e..6c47e22a85d6 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_02.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_02.completion @@ -71,8 +71,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_05b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_05b.completion index 86fe1d71b1b3..6325e194723d 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_05b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_05b.completion @@ -75,8 +75,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_08.completion index 1182ec0cafa5..544a7a16407d 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_08.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_08.completion @@ -75,8 +75,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_15a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_15a.completion index 6fb815edcf18..209d960c9edc 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_15a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_15a.completion @@ -75,8 +75,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_17d.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_17d.completion index 28d3d83cde44..090f358ea96a 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_17d.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_17d.completion @@ -77,8 +77,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_18c.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_18c.completion index 24a8f387024c..bd6fd2876b7d 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_18c.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_18c.completion @@ -77,8 +77,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_21b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_21b.completion index 3bca30612295..1421f6358971 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_21b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_21b.completion @@ -78,8 +78,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_24b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_24b.completion index eb2e7d3b915e..59e7a1f5b289 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_24b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctions/arrowFunctions.php.testArrowFunctions_24b.completion @@ -78,8 +78,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunction/arrowFunctionsInFunction.php.testArrowFunctionsInFunction_01a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunction/arrowFunctionsInFunction.php.testArrowFunctionsInFunction_01a.completion index 88a640521413..064f2c02e3aa 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunction/arrowFunctionsInFunction.php.testArrowFunctionsInFunction_01a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunction/arrowFunctionsInFunction.php.testArrowFunctionsInFunction_01a.completion @@ -73,8 +73,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunctionWithError/arrowFunctionsInFunctionWithError.php.testArrowFunctionsInFunctionWithError_01a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunctionWithError/arrowFunctionsInFunctionWithError.php.testArrowFunctionsInFunctionWithError_01a.completion index adb37b834828..e97cb0d903c0 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunctionWithError/arrowFunctionsInFunctionWithError.php.testArrowFunctionsInFunctionWithError_01a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunctionWithError/arrowFunctionsInFunctionWithError.php.testArrowFunctionsInFunctionWithError_01a.completion @@ -74,8 +74,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunctionWithError/arrowFunctionsInFunctionWithError.php.testArrowFunctionsInFunctionWithError_02a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunctionWithError/arrowFunctionsInFunctionWithError.php.testArrowFunctionsInFunctionWithError_02a.completion index a692278ef3e6..34de50b99eed 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunctionWithError/arrowFunctionsInFunctionWithError.php.testArrowFunctionsInFunctionWithError_02a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunctionWithError/arrowFunctionsInFunctionWithError.php.testArrowFunctionsInFunctionWithError_02a.completion @@ -75,8 +75,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunctionWithError/arrowFunctionsInFunctionWithError.php.testArrowFunctionsInFunctionWithError_03a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunctionWithError/arrowFunctionsInFunctionWithError.php.testArrowFunctionsInFunctionWithError_03a.completion index f619b77555de..cd38584f6abb 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunctionWithError/arrowFunctionsInFunctionWithError.php.testArrowFunctionsInFunctionWithError_03a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInFunctionWithError/arrowFunctionsInFunctionWithError.php.testArrowFunctionsInFunctionWithError_03a.completion @@ -74,8 +74,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInMethod/arrowFunctionsInMethod.php.testArrowFunctionsInMethod_01a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInMethod/arrowFunctionsInMethod.php.testArrowFunctionsInMethod_01a.completion index e66f3e500de2..c7bd0db4f810 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInMethod/arrowFunctionsInMethod.php.testArrowFunctionsInMethod_01a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInMethod/arrowFunctionsInMethod.php.testArrowFunctionsInMethod_01a.completion @@ -77,8 +77,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInMethodWithError/arrowFunctionsInMethodWithError.php.testArrowFunctionsInMethodWithError_01a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInMethodWithError/arrowFunctionsInMethodWithError.php.testArrowFunctionsInMethodWithError_01a.completion index d2b960325065..8957e42f3ebd 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInMethodWithError/arrowFunctionsInMethodWithError.php.testArrowFunctionsInMethodWithError_01a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInMethodWithError/arrowFunctionsInMethodWithError.php.testArrowFunctionsInMethodWithError_01a.completion @@ -78,8 +78,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInMethodWithError/arrowFunctionsInMethodWithError.php.testArrowFunctionsInMethodWithError_02a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInMethodWithError/arrowFunctionsInMethodWithError.php.testArrowFunctionsInMethodWithError_02a.completion index 90d3da40797e..4c31fd03f432 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInMethodWithError/arrowFunctionsInMethodWithError.php.testArrowFunctionsInMethodWithError_02a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsInMethodWithError/arrowFunctionsInMethodWithError.php.testArrowFunctionsInMethodWithError_02a.completion @@ -78,8 +78,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsNested/arrowFunctionsNested.php.testArrowFunctionsNested_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsNested/arrowFunctionsNested.php.testArrowFunctionsNested_01.completion index 2b020683f565..f48b54ad72f2 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsNested/arrowFunctionsNested.php.testArrowFunctionsNested_01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsNested/arrowFunctionsNested.php.testArrowFunctionsNested_01.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError01/arrowFunctionsWithError01.php.testArrowFunctionsWithError01_01a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError01/arrowFunctionsWithError01.php.testArrowFunctionsWithError01_01a.completion index 5f27a420e01b..d8eaaa6d34f2 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError01/arrowFunctionsWithError01.php.testArrowFunctionsWithError01_01a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError01/arrowFunctionsWithError01.php.testArrowFunctionsWithError01_01a.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError01/arrowFunctionsWithError01.php.testArrowFunctionsWithError01_01b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError01/arrowFunctionsWithError01.php.testArrowFunctionsWithError01_01b.completion index ff8ac855e793..5c115a71d601 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError01/arrowFunctionsWithError01.php.testArrowFunctionsWithError01_01b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError01/arrowFunctionsWithError01.php.testArrowFunctionsWithError01_01b.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError02/arrowFunctionsWithError02.php.testArrowFunctionsWithError02_01a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError02/arrowFunctionsWithError02.php.testArrowFunctionsWithError02_01a.completion index 3b82a0c19dc4..e843d8d33b5b 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError02/arrowFunctionsWithError02.php.testArrowFunctionsWithError02_01a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError02/arrowFunctionsWithError02.php.testArrowFunctionsWithError02_01a.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError02/arrowFunctionsWithError02.php.testArrowFunctionsWithError02_01b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError02/arrowFunctionsWithError02.php.testArrowFunctionsWithError02_01b.completion index 5b9e5b97548e..2fb1b99339f0 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError02/arrowFunctionsWithError02.php.testArrowFunctionsWithError02_01b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError02/arrowFunctionsWithError02.php.testArrowFunctionsWithError02_01b.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError02/arrowFunctionsWithError02.php.testArrowFunctionsWithError02_03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError02/arrowFunctionsWithError02.php.testArrowFunctionsWithError02_03.completion index 5572d03683d7..79cb7924dc2f 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError02/arrowFunctionsWithError02.php.testArrowFunctionsWithError02_03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testArrowFunctionsWithError02/arrowFunctionsWithError02.php.testArrowFunctionsWithError02_03.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct 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 88069579b3ee..b5df9fc571a5 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 @@ -85,8 +85,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct 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 ebba0fa41084..1979d42d46ca 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 @@ -86,8 +86,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct 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 425e4136074d..59aec6f6588b 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 @@ -87,8 +87,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct 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 5eb2dbe61d89..2d3e71c25f0e 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 @@ -87,8 +87,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_06.completion index ff22f10eb883..b89709ab0cc7 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_06.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_06.completion @@ -21,8 +21,14 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD static null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_06_php73.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_06_php73.completion index 899ed9eae27d..796eaa1f5da8 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_06_php73.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_06_php73.completion @@ -7,8 +7,14 @@ KEYWORD const null KEYWORD final null KEYWORD function null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD static null KEYWORD var null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_07.completion index b236928325ab..888d043a8d38 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_07.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_07.completion @@ -7,8 +7,14 @@ KEYWORD const null KEYWORD final null KEYWORD function null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD static null KEYWORD var null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_08.completion index 65853523140e..5dd8ff22ca6a 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_08.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_08.completion @@ -9,6 +9,7 @@ CLASS TypedPropertiesClass [PUBLIC] Foo KEYWORD array null KEYWORD bool null KEYWORD false null +KEYWORD final null KEYWORD float null KEYWORD int null KEYWORD iterable null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_09.completion index 1bb4e2fa6d85..3d35b49b63c8 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_09.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_09.completion @@ -7,8 +7,14 @@ KEYWORD const null KEYWORD final null KEYWORD function null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD static null KEYWORD var null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_16.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_16.completion index f10f894f959a..90e521670797 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_16.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_16.completion @@ -21,8 +21,14 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD static null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_16_php73.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_16_php73.completion index 9512c7673ca8..10a91ca99fce 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_16_php73.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_16_php73.completion @@ -7,8 +7,14 @@ KEYWORD const null KEYWORD final null KEYWORD function null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD static null KEYWORD var null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_17.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_17.completion index f761f00ce1ec..86bd6cf95dbf 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_17.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_17.completion @@ -21,8 +21,14 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD static null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_17_php73.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_17_php73.completion index 0f3f8b317891..e0eddcb60847 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_17_php73.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Class/typedProperties20Class.php.testTypedProperties20Class_17_php73.completion @@ -7,8 +7,14 @@ KEYWORD const null KEYWORD final null KEYWORD function null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD static null KEYWORD var null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_06.completion index eb514910cb46..a6c18462c687 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_06.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_06.completion @@ -20,8 +20,14 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD static null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_06_php73.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_06_php73.completion index 899ed9eae27d..796eaa1f5da8 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_06_php73.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_06_php73.completion @@ -7,8 +7,14 @@ KEYWORD const null KEYWORD final null KEYWORD function null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD static null KEYWORD var null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_07.completion index b236928325ab..888d043a8d38 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_07.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_07.completion @@ -7,8 +7,14 @@ KEYWORD const null KEYWORD final null KEYWORD function null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD static null KEYWORD var null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_08.completion index 31e02b70e0de..bf8078e06328 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_08.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_08.completion @@ -8,6 +8,7 @@ CLASS MyClass [PUBLIC] Bar KEYWORD array null KEYWORD bool null KEYWORD false null +KEYWORD final null KEYWORD float null KEYWORD int null KEYWORD iterable null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_10.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_10.completion index 152fc17af61f..f49730610cce 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_10.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_10.completion @@ -7,8 +7,14 @@ KEYWORD const null KEYWORD final null KEYWORD function null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD static null KEYWORD var null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_17.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_17.completion index f7ca55178233..0a04882b0583 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_17.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_17.completion @@ -20,8 +20,14 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD static null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_17_php73.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_17_php73.completion index 9512c7673ca8..10a91ca99fce 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_17_php73.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_17_php73.completion @@ -7,8 +7,14 @@ KEYWORD const null KEYWORD final null KEYWORD function null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD static null KEYWORD var null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_18.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_18.completion index b0e123056872..65ed09f0c31f 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_18.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_18.completion @@ -20,8 +20,14 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD static null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_18_php73.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_18_php73.completion index 0f3f8b317891..e0eddcb60847 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_18_php73.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php74/testTypedProperties20Trait/typedProperties20Trait.php.testTypedProperties20Trait_18_php73.completion @@ -7,8 +7,14 @@ KEYWORD const null KEYWORD final null KEYWORD function null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD static null KEYWORD var null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01a/constructorPropertyPromotion01a.php.testConstructorPropertyPromotion01a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01a/constructorPropertyPromotion01a.php.testConstructorPropertyPromotion01a.completion index 0f375e591fc7..e697a06af7f5 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01a/constructorPropertyPromotion01a.php.testConstructorPropertyPromotion01a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01a/constructorPropertyPromotion01a.php.testConstructorPropertyPromotion01a.completion @@ -15,8 +15,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01b/constructorPropertyPromotion01b.php.testConstructorPropertyPromotion01b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01b/constructorPropertyPromotion01b.php.testConstructorPropertyPromotion01b.completion index 0b74ad7b4496..c4c2a34718df 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01b/constructorPropertyPromotion01b.php.testConstructorPropertyPromotion01b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion01b/constructorPropertyPromotion01b.php.testConstructorPropertyPromotion01b.completion @@ -16,8 +16,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion02a/constructorPropertyPromotion02a.php.testConstructorPropertyPromotion02a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion02a/constructorPropertyPromotion02a.php.testConstructorPropertyPromotion02a.completion index e34f268c834c..04abc587965e 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion02a/constructorPropertyPromotion02a.php.testConstructorPropertyPromotion02a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion02a/constructorPropertyPromotion02a.php.testConstructorPropertyPromotion02a.completion @@ -3,4 +3,6 @@ public function __construct(pr|) { (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) ------------------------------------ KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion02b/constructorPropertyPromotion02b.php.testConstructorPropertyPromotion02b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion02b/constructorPropertyPromotion02b.php.testConstructorPropertyPromotion02b.completion index 51e8ee0fa8ae..067c1efaa9da 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion02b/constructorPropertyPromotion02b.php.testConstructorPropertyPromotion02b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion02b/constructorPropertyPromotion02b.php.testConstructorPropertyPromotion02b.completion @@ -3,4 +3,6 @@ pr| (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) ------------------------------------ KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03a/constructorPropertyPromotion03a.php.testConstructorPropertyPromotion03a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03a/constructorPropertyPromotion03a.php.testConstructorPropertyPromotion03a.completion index 45b5503d2ce7..395965e98a79 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03a/constructorPropertyPromotion03a.php.testConstructorPropertyPromotion03a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03a/constructorPropertyPromotion03a.php.testConstructorPropertyPromotion03a.completion @@ -15,8 +15,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03b/constructorPropertyPromotion03b.php.testConstructorPropertyPromotion03b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03b/constructorPropertyPromotion03b.php.testConstructorPropertyPromotion03b.completion index e44328b4b272..7b696704e23c 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03b/constructorPropertyPromotion03b.php.testConstructorPropertyPromotion03b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion03b/constructorPropertyPromotion03b.php.testConstructorPropertyPromotion03b.completion @@ -15,8 +15,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06a/constructorPropertyPromotion06a.php.testConstructorPropertyPromotion06a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06a/constructorPropertyPromotion06a.php.testConstructorPropertyPromotion06a.completion index e8f818e5a86a..ddd8da660d2b 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06a/constructorPropertyPromotion06a.php.testConstructorPropertyPromotion06a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06a/constructorPropertyPromotion06a.php.testConstructorPropertyPromotion06a.completion @@ -15,8 +15,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06b/constructorPropertyPromotion06b.php.testConstructorPropertyPromotion06b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06b/constructorPropertyPromotion06b.php.testConstructorPropertyPromotion06b.completion index 287a12a509ac..19f624cc696c 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06b/constructorPropertyPromotion06b.php.testConstructorPropertyPromotion06b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion06b/constructorPropertyPromotion06b.php.testConstructorPropertyPromotion06b.completion @@ -15,8 +15,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07a/constructorPropertyPromotion07a.php.testConstructorPropertyPromotion07a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07a/constructorPropertyPromotion07a.php.testConstructorPropertyPromotion07a.completion index 7c3b887978ed..fca971d36c41 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07a/constructorPropertyPromotion07a.php.testConstructorPropertyPromotion07a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07a/constructorPropertyPromotion07a.php.testConstructorPropertyPromotion07a.completion @@ -15,8 +15,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07b/constructorPropertyPromotion07b.php.testConstructorPropertyPromotion07b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07b/constructorPropertyPromotion07b.php.testConstructorPropertyPromotion07b.completion index c9f45f0115d2..1ea2d55e82fe 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07b/constructorPropertyPromotion07b.php.testConstructorPropertyPromotion07b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testConstructorPropertyPromotion07b/constructorPropertyPromotion07b.php.testConstructorPropertyPromotion07b.completion @@ -15,8 +15,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_01.completion index 0b098b49ed9f..c62628d5245d 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testMixedType/mixedType.php.testMixedType_01.completion @@ -18,8 +18,14 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD static null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor01/namedArgumentsConstructor01.php.testNamedArgumentsConstructor01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor01/namedArgumentsConstructor01.php.testNamedArgumentsConstructor01.completion index 278fd6b21459..06b72e605f6b 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor01/namedArgumentsConstructor01.php.testNamedArgumentsConstructor01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor01/namedArgumentsConstructor01.php.testNamedArgumentsConstructor01.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor02/namedArgumentsConstructor02.php.testNamedArgumentsConstructor02_b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor02/namedArgumentsConstructor02.php.testNamedArgumentsConstructor02_b.completion index e0c23761e7bc..c42b8a28f134 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor02/namedArgumentsConstructor02.php.testNamedArgumentsConstructor02_b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor02/namedArgumentsConstructor02.php.testNamedArgumentsConstructor02_b.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor03/namedArgumentsConstructor03.php.testNamedArgumentsConstructor03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor03/namedArgumentsConstructor03.php.testNamedArgumentsConstructor03.completion index 5fdd60d3d76b..531ccaeaf0f3 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor03/namedArgumentsConstructor03.php.testNamedArgumentsConstructor03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor03/namedArgumentsConstructor03.php.testNamedArgumentsConstructor03.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor05/namedArgumentsConstructor05.php.testNamedArgumentsConstructor05_a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor05/namedArgumentsConstructor05.php.testNamedArgumentsConstructor05_a.completion index 592ed924b1c5..893d1d3db2ba 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor05/namedArgumentsConstructor05.php.testNamedArgumentsConstructor05_a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor05/namedArgumentsConstructor05.php.testNamedArgumentsConstructor05_a.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor05/namedArgumentsConstructor05.php.testNamedArgumentsConstructor05_b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor05/namedArgumentsConstructor05.php.testNamedArgumentsConstructor05_b.completion index bc2dc9805cd6..b0940a99c877 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor05/namedArgumentsConstructor05.php.testNamedArgumentsConstructor05_b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor05/namedArgumentsConstructor05.php.testNamedArgumentsConstructor05_b.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor06/namedArgumentsConstructor06.php.testNamedArgumentsConstructor06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor06/namedArgumentsConstructor06.php.testNamedArgumentsConstructor06.completion index d17c01ae6dba..a5e7e4b19ae0 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor06/namedArgumentsConstructor06.php.testNamedArgumentsConstructor06.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsConstructor06/namedArgumentsConstructor06.php.testNamedArgumentsConstructor06.completion @@ -76,8 +76,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction01/namedArgumentsFunction01.php.testNamedArgumentsFunction01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction01/namedArgumentsFunction01.php.testNamedArgumentsFunction01.completion index 25a5d76be0f7..da9e44f3425b 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction01/namedArgumentsFunction01.php.testNamedArgumentsFunction01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction01/namedArgumentsFunction01.php.testNamedArgumentsFunction01.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction03/namedArgumentsFunction03.php.testNamedArgumentsFunction03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction03/namedArgumentsFunction03.php.testNamedArgumentsFunction03.completion index b12d46931f76..9cf45e768265 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction03/namedArgumentsFunction03.php.testNamedArgumentsFunction03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction03/namedArgumentsFunction03.php.testNamedArgumentsFunction03.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction05/namedArgumentsFunction05.php.testNamedArgumentsFunction05_a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction05/namedArgumentsFunction05.php.testNamedArgumentsFunction05_a.completion index 694cd1a28988..0540bd8286aa 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction05/namedArgumentsFunction05.php.testNamedArgumentsFunction05_a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction05/namedArgumentsFunction05.php.testNamedArgumentsFunction05_a.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction05/namedArgumentsFunction05.php.testNamedArgumentsFunction05_b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction05/namedArgumentsFunction05.php.testNamedArgumentsFunction05_b.completion index 1920927050ff..6c41cf1bbbd3 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction05/namedArgumentsFunction05.php.testNamedArgumentsFunction05_b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction05/namedArgumentsFunction05.php.testNamedArgumentsFunction05_b.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction06/namedArgumentsFunction06.php.testNamedArgumentsFunction06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction06/namedArgumentsFunction06.php.testNamedArgumentsFunction06.completion index d7fa9860e6fe..71d69e2f7151 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction06/namedArgumentsFunction06.php.testNamedArgumentsFunction06.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunction06/namedArgumentsFunction06.php.testNamedArgumentsFunction06.completion @@ -71,8 +71,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunctionNested01/namedArgumentsFunctionNested01.php.testNamedArgumentsFunctionNested01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunctionNested01/namedArgumentsFunctionNested01.php.testNamedArgumentsFunctionNested01.completion index da7e80f9ca1c..66ea504ba085 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunctionNested01/namedArgumentsFunctionNested01.php.testNamedArgumentsFunctionNested01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunctionNested01/namedArgumentsFunctionNested01.php.testNamedArgumentsFunctionNested01.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunctionNested03/namedArgumentsFunctionNested03.php.testNamedArgumentsFunctionNested03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunctionNested03/namedArgumentsFunctionNested03.php.testNamedArgumentsFunctionNested03.completion index 65314310890c..917be024be46 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunctionNested03/namedArgumentsFunctionNested03.php.testNamedArgumentsFunctionNested03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsFunctionNested03/namedArgumentsFunctionNested03.php.testNamedArgumentsFunctionNested03.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod01/namedArgumentsMethod01.php.testNamedArgumentsMethod01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod01/namedArgumentsMethod01.php.testNamedArgumentsMethod01.completion index 8473751c6bb1..e9f23b4402ce 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod01/namedArgumentsMethod01.php.testNamedArgumentsMethod01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod01/namedArgumentsMethod01.php.testNamedArgumentsMethod01.completion @@ -78,8 +78,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod02/namedArgumentsMethod02.php.testNamedArgumentsMethod02_b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod02/namedArgumentsMethod02.php.testNamedArgumentsMethod02_b.completion index 38f5cae569e8..173741271801 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod02/namedArgumentsMethod02.php.testNamedArgumentsMethod02_b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod02/namedArgumentsMethod02.php.testNamedArgumentsMethod02_b.completion @@ -72,8 +72,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod03/namedArgumentsMethod03.php.testNamedArgumentsMethod03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod03/namedArgumentsMethod03.php.testNamedArgumentsMethod03.completion index cc65c7a493ae..8536c63779d9 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod03/namedArgumentsMethod03.php.testNamedArgumentsMethod03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod03/namedArgumentsMethod03.php.testNamedArgumentsMethod03.completion @@ -78,8 +78,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod05/namedArgumentsMethod05.php.testNamedArgumentsMethod05_a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod05/namedArgumentsMethod05.php.testNamedArgumentsMethod05_a.completion index 6b252d904c23..318771065427 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod05/namedArgumentsMethod05.php.testNamedArgumentsMethod05_a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod05/namedArgumentsMethod05.php.testNamedArgumentsMethod05_a.completion @@ -78,8 +78,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod05/namedArgumentsMethod05.php.testNamedArgumentsMethod05_b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod05/namedArgumentsMethod05.php.testNamedArgumentsMethod05_b.completion index 99e05d39fe83..c4b8fb128915 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod05/namedArgumentsMethod05.php.testNamedArgumentsMethod05_b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod05/namedArgumentsMethod05.php.testNamedArgumentsMethod05_b.completion @@ -78,8 +78,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod06/namedArgumentsMethod06.php.testNamedArgumentsMethod06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod06/namedArgumentsMethod06.php.testNamedArgumentsMethod06.completion index 3cdaf0b94b18..a08aa1b571ca 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod06/namedArgumentsMethod06.php.testNamedArgumentsMethod06.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsMethod06/namedArgumentsMethod06.php.testNamedArgumentsMethod06.completion @@ -80,8 +80,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod01/namedArgumentsStaticMethod01.php.testNamedArgumentsStaticMethod01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod01/namedArgumentsStaticMethod01.php.testNamedArgumentsStaticMethod01.completion index d96945630ca6..2f0b13604b66 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod01/namedArgumentsStaticMethod01.php.testNamedArgumentsStaticMethod01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod01/namedArgumentsStaticMethod01.php.testNamedArgumentsStaticMethod01.completion @@ -78,8 +78,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod02/namedArgumentsStaticMethod02.php.testNamedArgumentsStaticMethod02_b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod02/namedArgumentsStaticMethod02.php.testNamedArgumentsStaticMethod02_b.completion index bec8be2b5fd1..74b51081b7a0 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod02/namedArgumentsStaticMethod02.php.testNamedArgumentsStaticMethod02_b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod02/namedArgumentsStaticMethod02.php.testNamedArgumentsStaticMethod02_b.completion @@ -71,8 +71,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod03/namedArgumentsStaticMethod03.php.testNamedArgumentsStaticMethod03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod03/namedArgumentsStaticMethod03.php.testNamedArgumentsStaticMethod03.completion index b257de559538..b19fd102da9b 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod03/namedArgumentsStaticMethod03.php.testNamedArgumentsStaticMethod03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod03/namedArgumentsStaticMethod03.php.testNamedArgumentsStaticMethod03.completion @@ -78,8 +78,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod05/namedArgumentsStaticMethod05.php.testNamedArgumentsStaticMethod05_a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod05/namedArgumentsStaticMethod05.php.testNamedArgumentsStaticMethod05_a.completion index c9093ce579d2..7979bbc64e86 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod05/namedArgumentsStaticMethod05.php.testNamedArgumentsStaticMethod05_a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod05/namedArgumentsStaticMethod05.php.testNamedArgumentsStaticMethod05_a.completion @@ -78,8 +78,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod05/namedArgumentsStaticMethod05.php.testNamedArgumentsStaticMethod05_b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod05/namedArgumentsStaticMethod05.php.testNamedArgumentsStaticMethod05_b.completion index 06b398e2bd00..9eb6e4da8822 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod05/namedArgumentsStaticMethod05.php.testNamedArgumentsStaticMethod05_b.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod05/namedArgumentsStaticMethod05.php.testNamedArgumentsStaticMethod05_b.completion @@ -78,8 +78,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod06/namedArgumentsStaticMethod06.php.testNamedArgumentsStaticMethod06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod06/namedArgumentsStaticMethod06.php.testNamedArgumentsStaticMethod06.completion index c2dc2a7dc780..e6e8c3643342 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod06/namedArgumentsStaticMethod06.php.testNamedArgumentsStaticMethod06.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php80/testNamedArgumentsStaticMethod06/namedArgumentsStaticMethod06.php.testNamedArgumentsStaticMethod06.completion @@ -80,8 +80,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_01a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_01a.completion index 005796fb5628..fa90d7588da2 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_01a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_01a.completion @@ -24,8 +24,14 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD static null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_02a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_02a.completion index 11517c03b5ba..0734d1a78ea6 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_02a.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldType/enumsFieldType.php.testEnumsFieldType_02a.completion @@ -12,6 +12,7 @@ CLASS Interface1 [PUBLIC] EnumTestNamespace2 KEYWORD array null KEYWORD bool null KEYWORD false null +KEYWORD final null KEYWORD float null KEYWORD int null KEYWORD iterable null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping01/enumsFieldTypeTyping01.php.testEnumsFieldTypeTyping01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping01/enumsFieldTypeTyping01.php.testEnumsFieldTypeTyping01.completion index 90b42ec30955..5109ec46e3c1 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping01/enumsFieldTypeTyping01.php.testEnumsFieldTypeTyping01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping01/enumsFieldTypeTyping01.php.testEnumsFieldTypeTyping01.completion @@ -24,8 +24,14 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD static null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping03/enumsFieldTypeTyping03.php.testEnumsFieldTypeTyping03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping03/enumsFieldTypeTyping03.php.testEnumsFieldTypeTyping03.completion index e4f677959e7f..24beb194fef7 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping03/enumsFieldTypeTyping03.php.testEnumsFieldTypeTyping03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testEnumsFieldTypeTyping03/enumsFieldTypeTyping03.php.testEnumsFieldTypeTyping03.completion @@ -12,6 +12,7 @@ CLASS Interface1 [PUBLIC] EnumTestNamespace2 KEYWORD array null KEYWORD bool null KEYWORD false null +KEYWORD final null KEYWORD float null KEYWORD int null KEYWORD iterable null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNewInInitializersConstantTyping01/newInInitializersConstantTyping01.php.testNewInInitializersConstantTyping01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNewInInitializersConstantTyping01/newInInitializersConstantTyping01.php.testNewInInitializersConstantTyping01.completion index f4e51ec1d966..8312255d253a 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNewInInitializersConstantTyping01/newInInitializersConstantTyping01.php.testNewInInitializersConstantTyping01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNewInInitializersConstantTyping01/newInInitializersConstantTyping01.php.testNewInInitializersConstantTyping01.completion @@ -68,8 +68,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNewInInitializersStaticVariableTyping01/newInInitializersStaticVariableTyping01.php.testNewInInitializersStaticVariableTyping01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNewInInitializersStaticVariableTyping01/newInInitializersStaticVariableTyping01.php.testNewInInitializersStaticVariableTyping01.completion index cc54c478e806..ea6a51bfc581 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNewInInitializersStaticVariableTyping01/newInInitializersStaticVariableTyping01.php.testNewInInitializersStaticVariableTyping01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testNewInInitializersStaticVariableTyping01/newInInitializersStaticVariableTyping01.php.testNewInInitializersStaticVariableTyping01.completion @@ -68,8 +68,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping01/readonlyPropertiesTyping01.php.testReadonlyPromotedPropertiesTyping01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping01/readonlyPropertiesTyping01.php.testReadonlyPromotedPropertiesTyping01.completion index 72206a911df1..152f93e536f2 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping01/readonlyPropertiesTyping01.php.testReadonlyPromotedPropertiesTyping01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping01/readonlyPropertiesTyping01.php.testReadonlyPromotedPropertiesTyping01.completion @@ -15,8 +15,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPromotedPropertiesTyping03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPromotedPropertiesTyping03.completion index 49a3fbb3a790..e904df9ca5bb 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPromotedPropertiesTyping03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPromotedPropertiesTyping03.completion @@ -15,8 +15,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping04/readonlyPropertiesTyping04.php.testReadonlyPromotedPropertiesTyping04.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping04/readonlyPropertiesTyping04.php.testReadonlyPromotedPropertiesTyping04.completion index 829c61799054..4ddfa17f116f 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping04/readonlyPropertiesTyping04.php.testReadonlyPromotedPropertiesTyping04.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping04/readonlyPropertiesTyping04.php.testReadonlyPromotedPropertiesTyping04.completion @@ -4,5 +4,8 @@ readonly p| ------------------------------------ KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPromotedPropertiesTyping05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPromotedPropertiesTyping05.completion index 529caa097621..9cae6e6b855a 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPromotedPropertiesTyping05.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPromotedPropertiesTyping05.completion @@ -15,8 +15,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping06/readonlyPropertiesTyping06.php.testReadonlyPromotedPropertiesTyping06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping06/readonlyPropertiesTyping06.php.testReadonlyPromotedPropertiesTyping06.completion index 1eff452bc811..dc828dd364dd 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping06/readonlyPropertiesTyping06.php.testReadonlyPromotedPropertiesTyping06.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping06/readonlyPropertiesTyping06.php.testReadonlyPromotedPropertiesTyping06.completion @@ -15,8 +15,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping09/readonlyPropertiesTyping09.php.testReadonlyPromotedPropertiesTyping09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping09/readonlyPropertiesTyping09.php.testReadonlyPromotedPropertiesTyping09.completion index 2c190816cdf5..accd994a64b6 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping09/readonlyPropertiesTyping09.php.testReadonlyPromotedPropertiesTyping09.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping09/readonlyPropertiesTyping09.php.testReadonlyPromotedPropertiesTyping09.completion @@ -4,5 +4,8 @@ p| ------------------------------------ KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping10/readonlyPropertiesTyping10.php.testReadonlyPromotedPropertiesTyping10.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping10/readonlyPropertiesTyping10.php.testReadonlyPromotedPropertiesTyping10.completion index 8a4147c82f43..107216783816 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping10/readonlyPropertiesTyping10.php.testReadonlyPromotedPropertiesTyping10.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping10/readonlyPropertiesTyping10.php.testReadonlyPromotedPropertiesTyping10.completion @@ -15,8 +15,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping12/readonlyPropertiesTyping12.php.testReadonlyPromotedPropertiesTyping12.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping12/readonlyPropertiesTyping12.php.testReadonlyPromotedPropertiesTyping12.completion index eff90684cf85..78c2bb4e8112 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping12/readonlyPropertiesTyping12.php.testReadonlyPromotedPropertiesTyping12.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPromotedPropertiesTyping12/readonlyPropertiesTyping12.php.testReadonlyPromotedPropertiesTyping12.completion @@ -15,8 +15,11 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD string null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyProperties/readonlyProperties.php.testReadonlyProperties_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyProperties/readonlyProperties.php.testReadonlyProperties_01.completion index 43e06fcbd436..e4017d58ef0a 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyProperties/readonlyProperties.php.testReadonlyProperties_01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyProperties/readonlyProperties.php.testReadonlyProperties_01.completion @@ -3,3 +3,6 @@ publ|ic readonly int $publicReadonly; (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) ------------------------------------ KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyProperties/readonlyProperties.php.testReadonlyProperties_08.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyProperties/readonlyProperties.php.testReadonlyProperties_08.completion index 624e9f8bc6d7..7761d8134bc8 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyProperties/readonlyProperties.php.testReadonlyProperties_08.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyProperties/readonlyProperties.php.testReadonlyProperties_08.completion @@ -3,3 +3,6 @@ readonly publi|c string $readonlyPublic; (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) ------------------------------------ KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyProperties/readonlyProperties.php.testReadonlyProperties_13.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyProperties/readonlyProperties.php.testReadonlyProperties_13.completion index 54220271c51a..14093d84f8f1 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyProperties/readonlyProperties.php.testReadonlyProperties_13.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyProperties/readonlyProperties.php.testReadonlyProperties_13.completion @@ -3,3 +3,4 @@ publ|ic readonly int|string $promotedPublicReadonly = 0, (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) ------------------------------------ KEYWORD public null +KEYWORD public(set) null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping01/readonlyPropertiesTyping01.php.testReadonlyPropertiesTyping01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping01/readonlyPropertiesTyping01.php.testReadonlyPropertiesTyping01.completion index 08cddc4a73c9..3209d891f5f8 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping01/readonlyPropertiesTyping01.php.testReadonlyPropertiesTyping01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping01/readonlyPropertiesTyping01.php.testReadonlyPropertiesTyping01.completion @@ -24,8 +24,14 @@ KEYWORD const null KEYWORD final null KEYWORD function null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD static null KEYWORD var null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPropertiesTyping03.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPropertiesTyping03.completion index cdcf9405632c..261808a88798 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPropertiesTyping03.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping03/readonlyPropertiesTyping03.php.testReadonlyPropertiesTyping03.completion @@ -18,8 +18,14 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD static null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping04/readonlyPropertiesTyping04.php.testReadonlyPropertiesTyping04.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping04/readonlyPropertiesTyping04.php.testReadonlyPropertiesTyping04.completion index 829c61799054..e190ac7ac823 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping04/readonlyPropertiesTyping04.php.testReadonlyPropertiesTyping04.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping04/readonlyPropertiesTyping04.php.testReadonlyPropertiesTyping04.completion @@ -4,5 +4,11 @@ readonly p| ------------------------------------ KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPropertiesTyping05.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPropertiesTyping05.completion index f7392767db4f..c4a7e94d0c67 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPropertiesTyping05.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping05/readonlyPropertiesTyping05.php.testReadonlyPropertiesTyping05.completion @@ -6,6 +6,7 @@ CLASS ReadonlyProperties [PUBLIC] readonlyPropertiesTyping05 KEYWORD array null KEYWORD bool null KEYWORD false null +KEYWORD final null KEYWORD float null KEYWORD int null KEYWORD iterable null @@ -13,6 +14,9 @@ KEYWORD mixed null KEYWORD null null KEYWORD object null KEYWORD parent null +KEYWORD private(set) null +KEYWORD protected(set) null +KEYWORD public(set) null KEYWORD self null KEYWORD string null KEYWORD true null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping06/readonlyPropertiesTyping06.php.testReadonlyPropertiesTyping06.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping06/readonlyPropertiesTyping06.php.testReadonlyPropertiesTyping06.completion index 670fb511d2d2..37d30c76e0f5 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping06/readonlyPropertiesTyping06.php.testReadonlyPropertiesTyping06.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping06/readonlyPropertiesTyping06.php.testReadonlyPropertiesTyping06.completion @@ -3,5 +3,11 @@ p| (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) ------------------------------------ KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping07/readonlyPropertiesTyping07.php.testReadonlyPropertiesTyping07.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping07/readonlyPropertiesTyping07.php.testReadonlyPropertiesTyping07.completion index 1cb1eee51dda..72120c07a96e 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping07/readonlyPropertiesTyping07.php.testReadonlyPropertiesTyping07.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping07/readonlyPropertiesTyping07.php.testReadonlyPropertiesTyping07.completion @@ -18,8 +18,14 @@ KEYWORD null null KEYWORD object null KEYWORD parent null KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected private(set) null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public private(set) null +KEYWORD public protected(set) null +KEYWORD public(set) null KEYWORD readonly null KEYWORD self null KEYWORD static null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping09/readonlyPropertiesTyping09.php.testReadonlyPropertiesTyping09.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping09/readonlyPropertiesTyping09.php.testReadonlyPropertiesTyping09.completion index 72f7338838c2..a136b42ce25f 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping09/readonlyPropertiesTyping09.php.testReadonlyPropertiesTyping09.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php81/testReadonlyPropertiesTyping09/readonlyPropertiesTyping09.php.testReadonlyPropertiesTyping09.completion @@ -6,6 +6,7 @@ CLASS ReadonlyProperties [PUBLIC] readonlyPropertiesTyping09 KEYWORD array null KEYWORD bool null KEYWORD false null +KEYWORD final null KEYWORD float null KEYWORD int null KEYWORD iterable null @@ -13,6 +14,9 @@ KEYWORD mixed null KEYWORD null null KEYWORD object null KEYWORD parent null +KEYWORD private(set) null +KEYWORD protected(set) null +KEYWORD public(set) null KEYWORD self null KEYWORD string null KEYWORD true null diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchTyping/dynamicClassConstantFetchTyping.php.testDynamicClassConstantFetchTyping_01.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchTyping/dynamicClassConstantFetchTyping.php.testDynamicClassConstantFetchTyping_01.completion index 678ffc7d3a23..155b7d8f086c 100644 --- a/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchTyping/dynamicClassConstantFetchTyping.php.testDynamicClassConstantFetchTyping_01.completion +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php83/testDynamicClassConstantFetchTyping/dynamicClassConstantFetchTyping.php.testDynamicClassConstantFetchTyping_01.completion @@ -74,8 +74,11 @@ KEYWORD new null KEYWORD or null KEYWORD print ''; Language Construct KEYWORD private null +KEYWORD private(set) null KEYWORD protected null +KEYWORD protected(set) null KEYWORD public null +KEYWORD public(set) null KEYWORD readonly null KEYWORD require ''; Language Construct KEYWORD require_once ''; Language Construct diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass01/testAsymmetricVisibilityClass01.php b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass01/testAsymmetricVisibilityClass01.php new file mode 100644 index 000000000000..a941b1e895d3 --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass01/testAsymmetricVisibilityClass01.php @@ -0,0 +1,26 @@ +iPublicPublicSet = new Foo(); + $this->iPublicPrivateSet = new Foo(); + $this->iPublicProtectedSet1 = new Bar(); + $this->iPublicProtectedSet2 = new Bar(); + $this->publicProtectedSet = new Bar(); + $this->publicPrivateSet = new Bar(); + $this->protectedPrivateSet = new Foo(); + $this->finalProtectedPrivateSet = new Foo(); + $this->finalPublicPrivateSetReadonly = new Bar(); + } + + public function test(): void { + $this->privatePrivateSet; // test: all fields (parent class) + } +} + +$parent = new ParentClass(); +$parent->finalPublicPrivateSetReadonly; // test: only public methods (parent class) +$parent->iPublicPrivateSet; +$parent->iPublicProtectedSet1; +$parent->iPublicProtectedSet2; +$parent->publicPrivateSet; +$parent->publicProtectedSet; +$parent->iPublicPublicSet; + +class ChildClass extends ParentClass { + + public function test(): void { + $this->publicPrivateSet; // test: only public and protected (child class) + $this->publicProtectedSet->publicBarMethod(); // test: only public Bar (child class) + } +} + +class AsymmetricVisibilityPromoted { + public function __construct( + public(set) Foo $iPublicPublicSet, // constructor + private(set) string|int $iPublicPrivateSet, // constructor + protected(set) string|int $iPublicProtectedSet1, // constructor + public protected(set) Bar $publicProtectedSet, // constructor + protected private(set) readonly int $protectedPrivateSet, // constructor + private private(set) int $privatePrivateSet, // constructor + ) {} + + private function test(): void { + $this->iPublicPrivateSet; // test: all fields (promoted) + } +} + +$promoted = new AsymmetricVisibilityPromoted(new Foo(), "test", "test", new Bar(), 0); +$promoted->iPublicPrivateSet; // test: only public fields (promoted) + +new ChildClass()->test(); diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_01a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_01a.completion new file mode 100644 index 000000000000..6ddc7bd74f4a --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_01a.completion @@ -0,0 +1,24 @@ +Code completion result for source line: +$this->|privatePrivateSet; // test: all fields (parent class) +(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) +METHOD test() [PUBLIC] ParentClass +VARIABLE Bar publicPrivateSet [PUBLIC] ParentClass +VARIABLE Bar publicPrivateSetTrait [PUBLIC] TestTrait +VARIABLE Bar publicProtectedSet [PUBLIC] ParentClass +VARIABLE Bar publicProtectedSetTrait [PUBLIC] TestTrait +VARIABLE Bar|(ParentClass&Foo) finalPub [PUBLIC] ParentClass +VARIABLE Bar|(ParentClass&Foo) finalPub [PUBLIC] TestTrait +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] ParentClass +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] TestTrait +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] ParentClass +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] TestTrait +VARIABLE Foo iPublicPublicSet [PUBLIC] ParentClass +VARIABLE Foo iPublicPublicSetTrait [PUBLIC] TestTrait +VARIABLE int|Foo finalProtectedPrivateS [PROTECTE ParentClass +VARIABLE int|Foo finalProtectedPrivateS [PROTECTE TestTrait +VARIABLE int|Foo protectedPrivateSet [PROTECTE ParentClass +VARIABLE int|Foo protectedPrivateSetTra [PROTECTE TestTrait +VARIABLE string privatePrivateSeTraitt [PRIVATE] TestTrait +VARIABLE string privatePrivateSet [PRIVATE] ParentClass +VARIABLE string|Foo iPublicPrivateSet [PUBLIC] ParentClass +VARIABLE string|Foo iPublicPrivateSetTr [PUBLIC] TestTrait diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_01b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_01b.completion new file mode 100644 index 000000000000..7d9b881de869 --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_01b.completion @@ -0,0 +1,5 @@ +Code completion result for source line: +$this->privatePriva|teSet; // test: all fields (parent class) +(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) +VARIABLE string privatePrivateSeTraitt [PRIVATE] TestTrait +VARIABLE string privatePrivateSet [PRIVATE] ParentClass diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_02a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_02a.completion new file mode 100644 index 000000000000..515702041013 --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_02a.completion @@ -0,0 +1,18 @@ +Code completion result for source line: +$parent->|finalPublicPrivateSetReadonly; // test: only public methods (parent class) +(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) +METHOD test() [PUBLIC] ParentClass +VARIABLE Bar publicPrivateSet [PUBLIC] ParentClass +VARIABLE Bar publicPrivateSetTrait [PUBLIC] TestTrait +VARIABLE Bar publicProtectedSet [PUBLIC] ParentClass +VARIABLE Bar publicProtectedSetTrait [PUBLIC] TestTrait +VARIABLE Bar|(ParentClass&Foo) finalPub [PUBLIC] ParentClass +VARIABLE Bar|(ParentClass&Foo) finalPub [PUBLIC] TestTrait +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] ParentClass +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] TestTrait +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] ParentClass +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] TestTrait +VARIABLE Foo iPublicPublicSet [PUBLIC] ParentClass +VARIABLE Foo iPublicPublicSetTrait [PUBLIC] TestTrait +VARIABLE string|Foo iPublicPrivateSet [PUBLIC] ParentClass +VARIABLE string|Foo iPublicPrivateSetTr [PUBLIC] TestTrait diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_02b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_02b.completion new file mode 100644 index 000000000000..ee9480ead352 --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_02b.completion @@ -0,0 +1,5 @@ +Code completion result for source line: +$parent->finalPublicPrivateSetR|eadonly; // test: only public methods (parent class) +(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) +VARIABLE Bar|(ParentClass&Foo) finalPub [PUBLIC] ParentClass +VARIABLE Bar|(ParentClass&Foo) finalPub [PUBLIC] TestTrait diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_03a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_03a.completion new file mode 100644 index 000000000000..f70e0918344f --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_03a.completion @@ -0,0 +1,22 @@ +Code completion result for source line: +$this->|publicPrivateSet; // test: only public and protected (child class) +(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) +METHOD test() [PUBLIC] ChildClass +VARIABLE Bar publicPrivateSet [PUBLIC] ParentClass +VARIABLE Bar publicPrivateSetTrait [PUBLIC] TestTrait +VARIABLE Bar publicProtectedSet [PUBLIC] ParentClass +VARIABLE Bar publicProtectedSetTrait [PUBLIC] TestTrait +VARIABLE Bar|(ParentClass&Foo) finalPub [PUBLIC] ParentClass +VARIABLE Bar|(ParentClass&Foo) finalPub [PUBLIC] TestTrait +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] ParentClass +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] TestTrait +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] ParentClass +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] TestTrait +VARIABLE Foo iPublicPublicSet [PUBLIC] ParentClass +VARIABLE Foo iPublicPublicSetTrait [PUBLIC] TestTrait +VARIABLE int|Foo finalProtectedPrivateS [PROTECTE ParentClass +VARIABLE int|Foo finalProtectedPrivateS [PROTECTE TestTrait +VARIABLE int|Foo protectedPrivateSet [PROTECTE ParentClass +VARIABLE int|Foo protectedPrivateSetTra [PROTECTE TestTrait +VARIABLE string|Foo iPublicPrivateSet [PUBLIC] ParentClass +VARIABLE string|Foo iPublicPrivateSetTr [PUBLIC] TestTrait diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_03b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_03b.completion new file mode 100644 index 000000000000..a8914c33a3dd --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_03b.completion @@ -0,0 +1,5 @@ +Code completion result for source line: +$this->publicPrivateS|et; // test: only public and protected (child class) +(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) +VARIABLE Bar publicPrivateSet [PUBLIC] ParentClass +VARIABLE Bar publicPrivateSetTrait [PUBLIC] TestTrait diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_04a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_04a.completion new file mode 100644 index 000000000000..fc3acc7cad3f --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_04a.completion @@ -0,0 +1,22 @@ +Code completion result for source line: +$this->|publicProtectedSet->publicBarMethod(); // test: only public Bar (child class) +(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) +METHOD test() [PUBLIC] ChildClass +VARIABLE Bar publicPrivateSet [PUBLIC] ParentClass +VARIABLE Bar publicPrivateSetTrait [PUBLIC] TestTrait +VARIABLE Bar publicProtectedSet [PUBLIC] ParentClass +VARIABLE Bar publicProtectedSetTrait [PUBLIC] TestTrait +VARIABLE Bar|(ParentClass&Foo) finalPub [PUBLIC] ParentClass +VARIABLE Bar|(ParentClass&Foo) finalPub [PUBLIC] TestTrait +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] ParentClass +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] TestTrait +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] ParentClass +VARIABLE Bar|string iPublicProtectedSet [PUBLIC] TestTrait +VARIABLE Foo iPublicPublicSet [PUBLIC] ParentClass +VARIABLE Foo iPublicPublicSetTrait [PUBLIC] TestTrait +VARIABLE int|Foo finalProtectedPrivateS [PROTECTE ParentClass +VARIABLE int|Foo finalProtectedPrivateS [PROTECTE TestTrait +VARIABLE int|Foo protectedPrivateSet [PROTECTE ParentClass +VARIABLE int|Foo protectedPrivateSetTra [PROTECTE TestTrait +VARIABLE string|Foo iPublicPrivateSet [PUBLIC] ParentClass +VARIABLE string|Foo iPublicPrivateSetTr [PUBLIC] TestTrait diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_04b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_04b.completion new file mode 100644 index 000000000000..cf5e8009a250 --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_04b.completion @@ -0,0 +1,5 @@ +Code completion result for source line: +$this->publicProtec|tedSet->publicBarMethod(); // test: only public Bar (child class) +(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) +VARIABLE Bar publicProtectedSet [PUBLIC] ParentClass +VARIABLE Bar publicProtectedSetTrait [PUBLIC] TestTrait diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_04c.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_04c.completion new file mode 100644 index 000000000000..3b9426ad995e --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_04c.completion @@ -0,0 +1,9 @@ +Code completion result for source line: +$this->publicProtectedSet->|publicBarMethod(); // test: only public Bar (child class) +(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) +METHOD publicBarMethod() [PUBLIC] Bar +METHOD publicStaticBarMethod() [STATIC] Bar +VARIABLE int iPublicPrivateSetBarField [PUBLIC] Bar +VARIABLE int iPublicProtectedSetBarFiel [PUBLIC] Bar +VARIABLE int iPublicPublicSetBarField [PUBLIC] Bar +VARIABLE int publicBarField [PUBLIC] Bar diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_05a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_05a.completion new file mode 100644 index 000000000000..9ecaff7d1cc8 --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_05a.completion @@ -0,0 +1,10 @@ +Code completion result for source line: +$this->|iPublicPrivateSet; // test: all fields (promoted) +(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) +METHOD test() [PRIVATE] AsymmetricVisibilityPromoted +VARIABLE Bar publicProtectedSet [PUBLIC] AsymmetricVisibilityPromoted +VARIABLE Foo iPublicPublicSet [PUBLIC] AsymmetricVisibilityPromoted +VARIABLE int privatePrivateSet [PRIVATE] AsymmetricVisibilityPromoted +VARIABLE int protectedPrivateSet [PROTECTE AsymmetricVisibilityPromoted +VARIABLE string|int iPublicPrivateSet [PUBLIC] AsymmetricVisibilityPromoted +VARIABLE string|int iPublicProtectedSet [PUBLIC] AsymmetricVisibilityPromoted diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_05b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_05b.completion new file mode 100644 index 000000000000..146e7062c028 --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_05b.completion @@ -0,0 +1,6 @@ +Code completion result for source line: +$this->iPublic|PrivateSet; // test: all fields (promoted) +(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) +VARIABLE Foo iPublicPublicSet [PUBLIC] AsymmetricVisibilityPromoted +VARIABLE string|int iPublicPrivateSet [PUBLIC] AsymmetricVisibilityPromoted +VARIABLE string|int iPublicProtectedSet [PUBLIC] AsymmetricVisibilityPromoted diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_06a.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_06a.completion new file mode 100644 index 000000000000..4abbaa5b2e0f --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_06a.completion @@ -0,0 +1,7 @@ +Code completion result for source line: +$promoted->|iPublicPrivateSet; // test: only public fields (promoted) +(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) +VARIABLE Bar publicProtectedSet [PUBLIC] AsymmetricVisibilityPromoted +VARIABLE Foo iPublicPublicSet [PUBLIC] AsymmetricVisibilityPromoted +VARIABLE string|int iPublicPrivateSet [PUBLIC] AsymmetricVisibilityPromoted +VARIABLE string|int iPublicProtectedSet [PUBLIC] AsymmetricVisibilityPromoted diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_06b.completion b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_06b.completion new file mode 100644 index 000000000000..b223c05806d2 --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClass02/testAsymmetricVisibilityClass02.php.testAsymmetricVisibilityClass02_06b.completion @@ -0,0 +1,6 @@ +Code completion result for source line: +$promoted->iPubli|cPrivateSet; // test: only public fields (promoted) +(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true) +VARIABLE Foo iPublicPublicSet [PUBLIC] AsymmetricVisibilityPromoted +VARIABLE string|int iPublicPrivateSet [PUBLIC] AsymmetricVisibilityPromoted +VARIABLE string|int iPublicProtectedSet [PUBLIC] AsymmetricVisibilityPromoted diff --git a/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClassPromotedTyping01/testAsymmetricVisibilityClassPromotedTyping01.php b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClassPromotedTyping01/testAsymmetricVisibilityClassPromotedTyping01.php new file mode 100644 index 000000000000..a8a6863590c5 --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/completion/lib/php84/testAsymmetricVisibilityClassPromotedTyping01/testAsymmetricVisibilityClassPromotedTyping01.php @@ -0,0 +1,8 @@ +^privatePrivateSet; // test: all fields (parent class)"); + } + + public void testAsymmetricVisibilityClass02_01b() throws Exception { + checkCompletion(" $this->privatePriva^teSet; // test: all fields (parent class)"); + } + + public void testAsymmetricVisibilityClass02_02a() throws Exception { + checkCompletion("$parent->^finalPublicPrivateSetReadonly; // test: only public methods (parent class)"); + } + + public void testAsymmetricVisibilityClass02_02b() throws Exception { + checkCompletion("$parent->finalPublicPrivateSetR^eadonly; // test: only public methods (parent class)"); + } + + public void testAsymmetricVisibilityClass02_03a() throws Exception { + checkCompletion(" $this->^publicPrivateSet; // test: only public and protected (child class)"); + } + + public void testAsymmetricVisibilityClass02_03b() throws Exception { + checkCompletion(" $this->publicPrivateS^et; // test: only public and protected (child class)"); + } + + public void testAsymmetricVisibilityClass02_04a() throws Exception { + checkCompletion(" $this->^publicProtectedSet->publicBarMethod(); // test: only public Bar (child class)"); + } + + public void testAsymmetricVisibilityClass02_04b() throws Exception { + checkCompletion(" $this->publicProtec^tedSet->publicBarMethod(); // test: only public Bar (child class)"); + } + + public void testAsymmetricVisibilityClass02_04c() throws Exception { + checkCompletion(" $this->publicProtectedSet->^publicBarMethod(); // test: only public Bar (child class)"); + } + + public void testAsymmetricVisibilityClass02_05a() throws Exception { + checkCompletion(" $this->^iPublicPrivateSet; // test: all fields (promoted)"); + } + + public void testAsymmetricVisibilityClass02_05b() throws Exception { + checkCompletion(" $this->iPublic^PrivateSet; // test: all fields (promoted)"); + } + + public void testAsymmetricVisibilityClass02_06a() throws Exception { + checkCompletion("$promoted->^iPublicPrivateSet; // test: only public fields (promoted)"); + } + + public void testAsymmetricVisibilityClass02_06b() throws Exception { + checkCompletion("$promoted->iPubli^cPrivateSet; // test: only public fields (promoted)"); + } + + public void testAsymmetricVisibilityClassTyping01() throws Exception { + checkCompletion("^// test"); + } + + public void testAsymmetricVisibilityClassTyping02() throws Exception { + checkCompletion("fi^"); + } + + public void testAsymmetricVisibilityClassTyping03() throws Exception { + checkCompletion("public ^"); + } + + public void testAsymmetricVisibilityClassTyping04() throws Exception { + checkCompletion("public pri^"); + } + + public void testAsymmetricVisibilityClassTyping05() throws Exception { + checkCompletion("public private(set) ^"); + } + + public void testAsymmetricVisibilityClassTyping06() throws Exception { + checkCompletion("public private(set) readonly ^"); + } + + public void testAsymmetricVisibilityClassTyping07() throws Exception { + checkCompletion("public private(set) readonly final ^"); + } + + public void testAsymmetricVisibilityClassTyping08() throws Exception { + checkCompletion("public private(set) readonly final string|^"); + } + + public void testAsymmetricVisibilityClassTyping09() throws Exception { + checkCompletion("final public private(set) readonly string|A^"); + } + + public void testAsymmetricVisibilityClassPromotedTyping01() throws Exception { + checkCompletion(" ^// test"); + } + + public void testAsymmetricVisibilityClassPromotedTyping02() throws Exception { + checkCompletion(" p^// test"); + } + + public void testAsymmetricVisibilityClassPromotedTyping03() throws Exception { + checkCompletion(" public ^// test"); + } + + public void testAsymmetricVisibilityClassPromotedTyping04() throws Exception { + checkCompletion(" public pri^// test"); + } + + public void testAsymmetricVisibilityClassPromotedTyping05() throws Exception { + checkCompletion(" public private(set) ^// test"); + } + + public void testAsymmetricVisibilityClassPromotedTyping06() throws Exception { + checkCompletion(" private protected(set) read^"); + } + + public void testAsymmetricVisibilityClassPromotedTyping07() throws Exception { + checkCompletion(" public private(set) readonly T^// test"); + } + + public void testAsymmetricVisibilityClassPromotedTyping08() throws Exception { + checkCompletion(" public private(set) readonly Test|^"); + } + + public void testAsymmetricVisibilityClassPromotedTyping09() throws Exception { + checkCompletion(" public protected(set) readonly Test1|(Test2 &^)"); + } }