This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new cdad76e [NETBEANS-6217] Allow Convert Visibility Suggestion to be
disabled
new eabd814 Merge pull request #3324 from
junichi11/netbeans-6217-convert-visibility-suggestion
cdad76e is described below
commit cdad76e295a882464bf0fd9ad4dc79f10d8b7429
Author: Junichi Yamamoto <junich...@apache.org>
AuthorDate: Thu Nov 18 22:07:39 2021 +0900
[NETBEANS-6217] Allow Convert Visibility Suggestion to be disabled
https://issues.apache.org/jira/browse/NETBEANS-6217
- Convert from SuggestionRule to HintRule
---
.../modules/php/editor/resources/layer.xml | 2 +-
.../verification/ConvertVisibilitySuggestion.java | 18 ++-
.../ConvertVisibilitySuggestionTest.java | 151 +++++++++++----------
3 files changed, 96 insertions(+), 75 deletions(-)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/resources/layer.xml
b/php/php.editor/src/org/netbeans/modules/php/editor/resources/layer.xml
index 0fb85fa..fc50623 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/resources/layer.xml
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/resources/layer.xml
@@ -351,6 +351,7 @@
<file
name="org-netbeans-modules-php-editor-verification-BracesHint$IfBracesHint.instance"/>
<file
name="org-netbeans-modules-php-editor-verification-BracesHint$WhileBracesHint.instance"/>
</folder>
+ <file
name="org-netbeans-modules-php-editor-verification-ConvertVisibilitySuggestion.instance"/>
<file
name="org-netbeans-modules-php-editor-verification-EmptyStatementHint.instance"/>
<file
name="org-netbeans-modules-php-editor-verification-ErrorControlOperatorHint.instance"/>
<file
name="org-netbeans-modules-php-editor-verification-ImmutableVariablesHint.instance"/>
@@ -406,7 +407,6 @@
<file
name="org-netbeans-modules-php-editor-verification-ArrowFunctionSuggestion.instance"/>
<file
name="org-netbeans-modules-php-editor-verification-AssignVariableSuggestion.instance"/>
<file
name="org-netbeans-modules-php-editor-verification-CombinedAssignmentOperatorSuggestion.instance"/>
- <file
name="org-netbeans-modules-php-editor-verification-ConvertVisibilitySuggestion.instance"/>
<file
name="org-netbeans-modules-php-editor-verification-DeclareStrictTypesSuggestion.instance"/>
<file
name="org-netbeans-modules-php-editor-verification-IdenticalComparisonSuggestion.instance"/>
<file
name="org-netbeans-modules-php-editor-verification-InitializeFieldSuggestion.instance"/>
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/ConvertVisibilitySuggestion.java
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/ConvertVisibilitySuggestion.java
index f62049f..704cda5 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/ConvertVisibilitySuggestion.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/ConvertVisibilitySuggestion.java
@@ -29,6 +29,7 @@ import org.netbeans.editor.BaseDocument;
import org.netbeans.modules.csl.api.EditList;
import org.netbeans.modules.csl.api.Hint;
import org.netbeans.modules.csl.api.HintFix;
+import org.netbeans.modules.csl.api.HintSeverity;
import org.netbeans.modules.csl.api.OffsetRange;
import org.netbeans.modules.csl.spi.support.CancelSupport;
import org.netbeans.modules.php.editor.api.PhpModifiers;
@@ -49,7 +50,7 @@ import org.openide.util.Pair;
/**
* Convert the visibility of a property, a method, or a constant.
*/
-public class ConvertVisibilitySuggestion extends SuggestionRule {
+public class ConvertVisibilitySuggestion extends HintRule {
private static final String HINT_ID = "Convert.Visibility.Suggestion"; //
NOI18N
private static final Logger LOGGER =
Logger.getLogger(ConvertVisibilitySuggestion.class.getName());
@@ -81,9 +82,8 @@ public class ConvertVisibilitySuggestion extends
SuggestionRule {
return;
}
final BaseDocument doc = context.doc;
- int caretOffset = getCaretOffset();
- OffsetRange lineBounds =
VerificationUtils.createLineBounds(caretOffset, doc);
- if (lineBounds.containsInclusive(caretOffset)) {
+ OffsetRange lineBounds =
VerificationUtils.createLineBounds(context.caretOffset, doc);
+ if (lineBounds.containsInclusive(context.caretOffset)) {
FileObject fileObject =
phpParseResult.getSnapshot().getSource().getFileObject();
if (fileObject != null) {
CheckVisitor checkVisitor = new CheckVisitor(fileObject, this,
context.doc, lineBounds);
@@ -96,6 +96,16 @@ public class ConvertVisibilitySuggestion extends
SuggestionRule {
}
}
+ @Override
+ public HintSeverity getDefaultSeverity() {
+ return HintSeverity.CURRENT_LINE_WARNING;
+ }
+
+ @Override
+ public boolean getDefaultEnabled() {
+ return false;
+ }
+
private static final class CheckVisitor extends DefaultVisitor {
private final FileObject fileObject;
diff --git
a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/ConvertVisibilitySuggestionTest.java
b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/ConvertVisibilitySuggestionTest.java
index 5548549..6e1e9d9 100644
---
a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/ConvertVisibilitySuggestionTest.java
+++
b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/verification/ConvertVisibilitySuggestionTest.java
@@ -18,6 +18,9 @@
*/
package org.netbeans.modules.php.editor.verification;
+import java.util.Collections;
+import java.util.Set;
+
public class ConvertVisibilitySuggestionTest extends PHPHintsTestBase {
public ConvertVisibilitySuggestionTest(String testName) {
@@ -30,284 +33,292 @@ public class ConvertVisibilitySuggestionTest extends
PHPHintsTestBase {
}
public void testConvertVisibilitySuggestionProperty_01() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " public $public = ^\"public\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " public $public = ^\"public\";");
}
public void testConvertVisibilitySuggestionProperty_02() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " public $public1 = \"public\", ^$public2 =
\"public\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " public $public1 = \"public\", ^$public2 =
\"public\";");
}
public void testConvertVisibilitySuggestionProperty_03() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " private $privat^e = \"private\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " private $privat^e = \"private\";");
}
public void testConvertVisibilitySuggestionProperty_04() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " protected $prote^cted = \"protected\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " protected $prote^cted = \"protected\";");
}
public void testConvertVisibilitySuggestionProperty_05() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " public static $^publicStatic = \"public\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " public static $^publicStatic = \"public\";");
}
public void testConvertVisibilitySuggestionProperty_06() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " public static ^$publicStatic1 = \"public\",
$publicStatic2 = \"public\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " public static ^$publicStatic1 = \"public\",
$publicStatic2 = \"public\";");
}
public void testConvertVisibilitySuggestionProperty_07() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " private static $privateStatic =
\"privat^e\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " private static $privateStatic =
\"privat^e\";");
}
public void testConvertVisibilitySuggestionProperty_08() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " protected static $protectedStatic =
\"protect^ed\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " protected static $protectedStatic =
\"protect^ed\";");
}
public void testConvertVisibilitySuggestionProperty_09() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " var $var ^= \"public\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " var $var ^= \"public\";");
}
public void testConvertVisibilitySuggestionConst_01() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " const IMPLICIT_CO^NST = \"implicit\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " const IMPLICIT_CO^NST = \"implicit\";");
}
public void testConvertVisibilitySuggestionConst_02() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " public const PUBLIC_CONST = \"pub^lic\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " public const PUBLIC_CONST = \"pub^lic\";");
}
public void testConvertVisibilitySuggestionConst_03() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " private const PRIVATE_CONST = \"priva^te\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " private const PRIVATE_CONST = \"priva^te\";");
}
public void testConvertVisibilitySuggestionConst_04() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " protected const ^PROTECTED_CONST =
\"protected\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " protected const ^PROTECTED_CONST =
\"protected\";");
}
public void testConvertVisibilitySuggestionMethod_01() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " function implicitMethod($param)^ {");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " function implicitMethod($param)^ {");
}
public void testConvertVisibilitySuggestionMethod_02() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " public function publicMethod($para^m) {");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " public function publicMethod($para^m) {");
}
public void testConvertVisibilitySuggestionMethod_03() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " private function privateMethod($param) {^");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " private function privateMethod($param) {^");
}
public void testConvertVisibilitySuggestionMethod_04() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " protected ^function protectedMethod($param)
{");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " protected ^function protectedMethod($param)
{");
}
public void testConvertVisibilitySuggestionMethod_05() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " static function implicitStaticMethod($pa^ram)
{");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " static function implicitStaticMethod($pa^ram)
{");
}
public void testConvertVisibilitySuggestionMethod_06() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " public static function
publicStaticMe^thod($param) {");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " public static function
publicStaticMe^thod($param) {");
}
public void testConvertVisibilitySuggestionMethod_07() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " private static ^function
privateStaticMethod($param) {");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " private static ^function
privateStaticMethod($param) {");
}
public void testConvertVisibilitySuggestionMethod_08() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " prote^cted static function
protectedStaticMethod($param) {");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " prote^cted static function
protectedStaticMethod($param) {");
}
public void testConvertVisibilitySuggestionInterfaceConst_01() throws
Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " const INTERFACE_IMPLICIT_CONST =
\"implici^t\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " const INTERFACE_IMPLICIT_CONST =
\"implici^t\";");
}
public void testConvertVisibilitySuggestionInterfaceConst_02() throws
Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " public const INTERFACE_P^UBLIC_CONST =
\"implicit\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " public const INTERFACE_P^UBLIC_CONST =
\"implicit\";");
}
public void testConvertVisibilitySuggestionInterfaceMethod_01() throws
Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " function interfaceImplicitMethod($para^m);");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " function interfaceImplicitMethod($para^m);");
}
public void testConvertVisibilitySuggestionInterfaceMethod_02() throws
Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " public ^function
interfacePublicMethod($param);");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " public ^function
interfacePublicMethod($param);");
}
public void testConvertVisibilitySuggestionInterfaceMethod_03() throws
Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " static function
interfaceImplicitStaticMeth^od();");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " static function
interfaceImplicitStaticMeth^od();");
}
public void testConvertVisibilitySuggestionInterfaceMethod_04() throws
Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " public ^static function
interfaceImplicitPublicStaticMethod();");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " public ^static function
interfaceImplicitPublicStaticMethod();");
}
public void testConvertVisibilitySuggestionGlobalConst_01() throws
Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", "const CON^STANT = \"global\";");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", "const CON^STANT = \"global\";");
}
public void testConvertVisibilitySuggestionAbstractMethod_01() throws
Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " abstract function
abstractImplici^tPublic();");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " abstract function
abstractImplici^tPublic();");
}
public void testConvertVisibilitySuggestionAbstractMethod_02() throws
Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " abstract public function abstractP^ublic();");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " abstract public function abstractP^ublic();");
}
public void testConvertVisibilitySuggestionAbstractMethod_03() throws
Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " abstract protected ^function
abstractProtected();");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " abstract protected ^function
abstractProtected();");
}
public void testConvertVisibilitySuggestionAbstractMethod_04() throws
Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " abstract static function
abstractImplicitPu^blicStatic();");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " abstract static function
abstractImplicitPu^blicStatic();");
}
public void testConvertVisibilitySuggestionAbstractMethod_05() throws
Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " abstract ^public static function
abstractPublicStatic();");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " abstract ^public static function
abstractPublicStatic();");
}
public void testConvertVisibilitySuggestionAbstractMethod_06() throws
Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibility.php", " abstract protected static function
abstractProtectedStat^ic();");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibility.php", " abstract protected static function
abstractProtectedStat^ic();");
}
public void testNETBEANS3968_01() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibilityNETBEANS-3968.php", " ^ } // test1");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityNETBEANS-3968.php", " ^ } // test1");
}
public void testNETBEANS3968_02() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibilityNETBEANS-3968.php", " ^ { // test2");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityNETBEANS-3968.php", " ^ { // test2");
}
public void testNETBEANS3968_03() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibilityNETBEANS-3968.php", " ^ // test3");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityNETBEANS-3968.php", " ^ // test3");
}
public void testNETBEANS3968_04() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibilityNETBEANS-3968.php", " ^} // test4");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityNETBEANS-3968.php", " ^} // test4");
}
public void testNETBEANS3968_05() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibilityNETBEANS-3968.php", " $p^aram; // test5");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityNETBEANS-3968.php", " $p^aram; // test5");
}
public void testNETBEANS3968_06() throws Exception {
- checkHints(new ConvertVisibilitySuggestion(),
"testConvertVisibilityNETBEANS-3968.php", " ^ } // test6");
+ checkHints(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityNETBEANS-3968.php", " ^ } // test6");
}
// Fix
public void testConvertVisibilitySuggestionPropertyFix_01() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityProperty.php", " var ^$var = \"public\";", "Convert
Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityProperty.php", " var ^$var = \"public\";", "Convert
Visibility");
}
public void testConvertVisibilitySuggestionPropertyFix_02() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityProperty.php", " public ^$public = \"public\";",
"Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityProperty.php", " public ^$public = \"public\";",
"Convert Visibility");
}
public void testConvertVisibilitySuggestionPropertyFix_03() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityProperty.php", " public $public1 = \"public\",
$public2^ = \"public\";", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityProperty.php", " public $public1 = \"public\",
$public2^ = \"public\";", "Convert Visibility");
}
public void testConvertVisibilitySuggestionPropertyFix_04() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityProperty.php", " private ^$private = \"private\";",
"Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityProperty.php", " private ^$private = \"private\";",
"Convert Visibility");
}
public void testConvertVisibilitySuggestionPropertyFix_05() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityProperty.php", " protected $protected =
\"pr^otected\";", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityProperty.php", " protected $protected =
\"pr^otected\";", "Convert Visibility");
}
public void testConvertVisibilitySuggestionPropertyFix_06() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityProperty.php", " public static $publicStat^ic =
\"public\";", "protected");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityProperty.php", " public static $publicStat^ic =
\"public\";", "protected");
}
public void testConvertVisibilitySuggestionPropertyFix_07() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityProperty.php", " public static $publicStatic1 =
\"public\", $publicStatic2 ^= \"public\";", "private");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityProperty.php", " public static $publicStatic1 =
\"public\", $publicStatic2 ^= \"public\";", "private");
}
public void testConvertVisibilitySuggestionPropertyFix_08() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityProperty.php", " private static $privateStatic =
\"priva^te\";", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityProperty.php", " private static $privateStatic =
\"priva^te\";", "Convert Visibility");
}
public void testConvertVisibilitySuggestionPropertyFix_09() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityProperty.php", " protected ^static $protectedStatic =
\"protected\";", "private");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityProperty.php", " protected ^static $protectedStatic =
\"protected\";", "private");
}
public void testConvertVisibilitySuggestionConstFix_01() throws Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityConst.php", " const IMPLICIT_CO^NST = \"implicit\";",
"Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityConst.php", " const IMPLICIT_CO^NST = \"implicit\";",
"Convert Visibility");
}
public void testConvertVisibilitySuggestionConstFix_02() throws Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityConst.php", " public const PUBLIC_CONST =
^\"public\";", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityConst.php", " public const PUBLIC_CONST =
^\"public\";", "Convert Visibility");
}
public void testConvertVisibilitySuggestionConstFix_03() throws Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityConst.php", " private const PRIVATE_CONST^ =
\"private\";", "protected");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityConst.php", " private const PRIVATE_CONST^ =
\"private\";", "protected");
}
public void testConvertVisibilitySuggestionConstFix_04() throws Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityConst.php", " protected const PROTECTED_^CONST =
\"protected\";", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityConst.php", " protected const PROTECTED_^CONST =
\"protected\";", "Convert Visibility");
}
public void testConvertVisibilitySuggestionMethodFix_01() throws Exception
{
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityMethod.php", " function implicitMeth^od($param) {",
"Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityMethod.php", " function implicitMeth^od($param) {",
"Convert Visibility");
}
public void testConvertVisibilitySuggestionMethodFix_02() throws Exception
{
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityMethod.php", " public function publicMethod($^param)
{", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityMethod.php", " public function publicMethod($^param)
{", "Convert Visibility");
}
public void testConvertVisibilitySuggestionMethodFix_03() throws Exception
{
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityMethod.php", " private function privat^eMethod($param)
{", "protected");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityMethod.php", " private function privat^eMethod($param)
{", "protected");
}
public void testConvertVisibilitySuggestionMethodFix_04() throws Exception
{
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityMethod.php", " protected fu^nction
protectedMethod($param) {", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityMethod.php", " protected fu^nction
protectedMethod($param) {", "Convert Visibility");
}
public void testConvertVisibilitySuggestionMethodFix_05() throws Exception
{
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityMethod.php", " static function
implicitStaticMethod($para^m) {", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityMethod.php", " static function
implicitStaticMethod($para^m) {", "Convert Visibility");
}
public void testConvertVisibilitySuggestionMethodFix_06() throws Exception
{
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityMethod.php", " public static fun^ction
publicStaticMethod($param) {", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityMethod.php", " public static fun^ction
publicStaticMethod($param) {", "Convert Visibility");
}
public void testConvertVisibilitySuggestionMethodFix_07() throws Exception
{
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityMethod.php", " private static function
privateStat^icMethod($param) {", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityMethod.php", " private static function
privateStat^icMethod($param) {", "Convert Visibility");
}
public void testConvertVisibilitySuggestionMethodFix_08() throws Exception
{
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityMethod.php", " protected static function
protecte^dStaticMethod($param) {", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityMethod.php", " protected static function
protecte^dStaticMethod($param) {", "Convert Visibility");
}
public void testConvertVisibilitySuggestionInterfaceFix_01() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityInterface.php", " const INTERFACE_IMPLICIT_CONST =
\"impli^cit\";", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityInterface.php", " const INTERFACE_IMPLICIT_CONST =
\"impli^cit\";", "Convert Visibility");
}
public void testConvertVisibilitySuggestionInterfaceFix_02() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityInterface.php", " function
interfaceImp^licitMethod($param);", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityInterface.php", " function
interfaceImp^licitMethod($param);", "Convert Visibility");
}
public void testConvertVisibilitySuggestionInterfaceFix_03() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityInterface.php", " static function
interfaceImplicitStaticMetho^d();", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityInterface.php", " static function
interfaceImplicitStaticMetho^d();", "Convert Visibility");
}
public void testConvertVisibilitySuggestionAbstractClassFix_01() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityAbstractClass.php", " abstract function
abst^ractImplicitPublic();", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityAbstractClass.php", " abstract function
abst^ractImplicitPublic();", "Convert Visibility");
}
public void testConvertVisibilitySuggestionAbstractClassFix_02() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityAbstractClass.php", " abstract public ^function
abstractPublic();", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityAbstractClass.php", " abstract public ^function
abstractPublic();", "Convert Visibility");
}
public void testConvertVisibilitySuggestionAbstractClassFix_03() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityAbstractClass.php", " abstract protected function
^abstractProtected();", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityAbstractClass.php", " abstract protected function
^abstractProtected();", "Convert Visibility");
}
public void testConvertVisibilitySuggestionAbstractClassFix_04() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityAbstractClass.php", " abstract ^static function
abstractImplicitPublicStatic();", "protected");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityAbstractClass.php", " abstract ^static function
abstractImplicitPublicStatic();", "protected");
}
public void testConvertVisibilitySuggestionAbstractClassFix_05() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityAbstractClass.php", " abstract public s^tatic function
abstractPublicStatic();", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityAbstractClass.php", " abstract public s^tatic function
abstractPublicStatic();", "Convert Visibility");
}
public void testConvertVisibilitySuggestionAbstractClassFix_06() throws
Exception {
- applyHint(new ConvertVisibilitySuggestion(),
"testConvertVisibilityAbstractClass.php", " abstract protected static
function abs^tractProtectedStatic();", "Convert Visibility");
+ applyHint(new ConvertVisibilitySuggestionStub(),
"testConvertVisibilityAbstractClass.php", " abstract protected static
function abs^tractProtectedStatic();", "Convert Visibility");
}
+ private static final class ConvertVisibilitySuggestionStub extends
ConvertVisibilitySuggestion {
+
+ @Override
+ public Set<? extends Object> getKinds() {
+ // XXX gotten as a suggestion when unit tests are run
+ return Collections.singleton(PHPHintsProvider.DEFAULT_SUGGESTIONS);
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
