[netbeans] branch master updated: Fix code completion for fields with single line var doc #6359
This is an automated email from the ASF dual-hosted git repository.
junichi11 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 86340d23dc Fix code completion for fields with single line var doc
#6359
new c473ac3ded Merge pull request #6364 from
junichi11/php-gh-6359-field-cc-with-single-line-vardoc
86340d23dc is described below
commit 86340d23dc59dcd6360bed2e125969c70bdd8e70
Author: Junichi Yamamoto
AuthorDate: Mon Aug 21 11:41:35 2023 +0900
Fix code completion for fields with single line var doc #6359
- https://github.com/apache/netbeans/issues/6359
- `/** @var Type $field */` is recognized as not `PHPDocBlock` but
`PHPVarComment`, so, check it
```php
// example
class X {
public function testX(): void {}
}
class Y {
public function testY(): void {}
}
class GH6359 {
/** @var X $testX */
protected $testX;
/** @var X|Y $testXorY */
protected $testXorY;
/** @var X $testXandY */
protected $testXandY;
public function test(): void {
$this->testX->testX();
$this->testXorY->testX();
$this->testXandY->testX();
}
}
```
---
.../php/editor/model/impl/VariousUtils.java| 12 +
.../testfiles/completion/lib/gh6359/gh6359.php | 42
.../lib/gh6359/gh6359.php.testGH6359_01.completion | 4 ++
.../lib/gh6359/gh6359.php.testGH6359_02.completion | 5 ++
.../lib/gh6359/gh6359.php.testGH6359_03.completion | 5 ++
.../completion/PHPCodeCompletionGH6359Test.java| 57 ++
6 files changed, 125 insertions(+)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
index 47e02265e4..9f7ba9a6bd 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
@@ -89,6 +89,7 @@ import
org.netbeans.modules.php.editor.parser.astnodes.PHPDocBlock;
import org.netbeans.modules.php.editor.parser.astnodes.PHPDocTag;
import org.netbeans.modules.php.editor.parser.astnodes.PHPDocTypeNode;
import org.netbeans.modules.php.editor.parser.astnodes.PHPDocVarTypeTag;
+import org.netbeans.modules.php.editor.parser.astnodes.PHPVarComment;
import org.netbeans.modules.php.editor.parser.astnodes.ParenthesisExpression;
import org.netbeans.modules.php.editor.parser.astnodes.Program;
import org.netbeans.modules.php.editor.parser.astnodes.Reference;
@@ -384,7 +385,18 @@ public final class VariousUtils {
break;
}
}
+} else if ((comment instanceof PHPVarComment) && PHPDocTag.Type.VAR ==
tagType) {
+// GH-6359
+// /** @var Type $field */
+// private $field;
+PHPVarComment varComment = (PHPVarComment) comment;
+PHPDocVarTypeTag tag = varComment.getVariable();
+String[] parts = WS_PATTERN.split(tag.getValue().trim(), 3); // 3:
@var Type $field
+if (parts.length > 1) {
+return parts[1];
+}
}
+
return null;
}
diff --git
a/php/php.editor/test/unit/data/testfiles/completion/lib/gh6359/gh6359.php
b/php/php.editor/test/unit/data/testfiles/completion/lib/gh6359/gh6359.php
new file mode 100644
index 00..c53bc705f8
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/completion/lib/gh6359/gh6359.php
@@ -0,0 +1,42 @@
+http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+class X {
+public function testX(): void {}
+}
+
+class Y {
+public function testY(): void {}
+}
+
+class GH6359 {
+
+/** @var X $testX */
+protected $testX;
+/** @var X|Y $testXorY */
+protected $testXorY;
+/** @var X $testXandY */
+protected $testXandY;
+
+public function test(): void {
+$this->testX->testX();
+$this->testXorY->testX();
+$this->testXandY->testX();
+}
+}
diff --git
a/php/php.editor/test/unit/data/testfiles/completion/lib/gh6359/gh6359.php.testGH6359_01.completion
b/php/php.editor/test/unit/data/testfiles/completion/lib/gh6359/gh6359.php.testGH6359_01.completion
new file mode 100644
index 00..66058090b3
--- /dev/null
+++
b/php/php.editor/test/unit/data/testfiles/completion/lib/gh6359/gh6359.php.testGH6359_01.completion
@@ -0,0 +1,4 @@
+Code completion result for
[netbeans] branch master updated: Fix the problem that typed fields marked as deprecated are not displayed as deprecated #6310
This is an automated email from the ASF dual-hosted git repository.
junichi11 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 dfcd6e5a66 Fix the problem that typed fields marked as deprecated are
not displayed as deprecated #6310
new 05ed416c12 Merge pull request #6321 from
junichi11/php-gh-6310-deprecated-typed-fields
dfcd6e5a66 is described below
commit dfcd6e5a66f7a6bfc428bdf47e562fbc6cc96b8a
Author: Junichi Yamamoto
AuthorDate: Tue Aug 8 07:07:05 2023 +0900
Fix the problem that typed fields marked as deprecated are not displayed as
deprecated #6310
- https://github.com/apache/netbeans/issues/6310
- Fix the `NodeRangeLocator`'s end offset when the node is the
`SingleFieldDeclaration` because a start offset is the start offset of not a
type but a variable name
- Add unit tests
---
.../modules/php/editor/parser/api/Utils.java | 45 +-
.../editor/parser/astnodes/FieldsDeclaration.java | 2 +-
.../structure/deprecatedTypedFields.pass | 30
.../deprecatedTypedFields.php | 155 +
...lds.php.testDeprecatedStaticTypedFields_01.html | 10 ++
...lds.php.testDeprecatedStaticTypedFields_02.html | 10 ++
...lds.php.testDeprecatedStaticTypedFields_03.html | 10 ++
...lds.php.testDeprecatedStaticTypedFields_04.html | 10 ++
...lds.php.testDeprecatedStaticTypedFields_05.html | 10 ++
...lds.php.testDeprecatedStaticTypedFields_06.html | 10 ++
...hp.testDeprecatedStaticTypedTraitFields_01.html | 10 ++
...hp.testDeprecatedStaticTypedTraitFields_02.html | 10 ++
...hp.testDeprecatedStaticTypedTraitFields_03.html | 10 ++
...hp.testDeprecatedStaticTypedTraitFields_04.html | 10 ++
...hp.testDeprecatedStaticTypedTraitFields_05.html | 10 ++
...hp.testDeprecatedStaticTypedTraitFields_06.html | 10 ++
...pedFields.php.testDeprecatedTypedFields_01.html | 10 ++
...pedFields.php.testDeprecatedTypedFields_02.html | 10 ++
...pedFields.php.testDeprecatedTypedFields_03.html | 10 ++
...pedFields.php.testDeprecatedTypedFields_04.html | 10 ++
...pedFields.php.testDeprecatedTypedFields_05.html | 10 ++
...pedFields.php.testDeprecatedTypedFields_06.html | 10 ++
...elds.php.testDeprecatedTypedTraitFields_01.html | 10 ++
...elds.php.testDeprecatedTypedTraitFields_02.html | 10 ++
...elds.php.testDeprecatedTypedTraitFields_03.html | 10 ++
...elds.php.testDeprecatedTypedTraitFields_04.html | 10 ++
...elds.php.testDeprecatedTypedTraitFields_05.html | 10 ++
...elds.php.testDeprecatedTypedTraitFields_06.html | 10 ++
.../deprecatedTypedFields.php | 121
.../deprecatedTypedFields.php.semantic | 121
.../testfiles/structure/deprecatedTypedFields.php | 121
.../editor/completion/PHPCCDocumentationTest.java | 106 ++
...DeprecatedTypedFieldsSemanticAnalysisTest.java} | 27 +---
.../php/editor/csl/NavigatorDeprecatedTest.java| 5 +
34 files changed, 944 insertions(+), 29 deletions(-)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/parser/api/Utils.java
b/php/php.editor/src/org/netbeans/modules/php/editor/parser/api/Utils.java
index 70a042f2f2..22aa07b897 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/api/Utils.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/api/Utils.java
@@ -19,6 +19,7 @@
package org.netbeans.modules.php.editor.parser.api;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import org.netbeans.modules.csl.api.OffsetRange;
import org.netbeans.modules.csl.spi.ParserResult;
@@ -27,6 +28,7 @@ import org.netbeans.modules.php.editor.parser.PHPParseResult;
import org.netbeans.modules.php.editor.parser.astnodes.ASTNode;
import org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration;
import org.netbeans.modules.php.editor.parser.astnodes.Comment;
+import org.netbeans.modules.php.editor.parser.astnodes.Expression;
import org.netbeans.modules.php.editor.parser.astnodes.FunctionName;
import org.netbeans.modules.php.editor.parser.astnodes.Identifier;
import org.netbeans.modules.php.editor.parser.astnodes.IntersectionType;
@@ -39,6 +41,7 @@ import
org.netbeans.modules.php.editor.parser.astnodes.PHPDocTypeTag;
import org.netbeans.modules.php.editor.parser.astnodes.PHPDocVarTypeTag;
import org.netbeans.modules.php.editor.parser.astnodes.Program;
import org.netbeans.modules.php.editor.parser.astnodes.Scalar;
+import org.netbeans.modules.php.editor.parser.astnodes.SingleFieldDeclaration;
import org.netbeans.modules.php.editor.parser.astnodes.UnionType;
import org.netbeans.modules.php.editor.parser.astnodes.Variable;
import
org.netbeans.modules.php.editor.parser.astnodes.visitors.DefaultTreePathVisitor;
@@ -72,7 +75,7 @@ public final class Utils {
[netbeans] branch master updated (fbd6ddd2fb -> 2b0637a876)
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from fbd6ddd2fb Merge pull request #6251 from
junichi11/php-gh-6247-wrong-suggestion-for-fix-imports
new 6e0a20ddc3 Improve IntroduceSuggestionTest
new 4f3cda2ce8 Prevent NPE when IntroduceSuggestionHint generates a method
#6258
new d94b06bfda Add unit tests for #6266
new 2b0637a876 Merge pull request #6269 from
junichi11/php-gh-6258-npe-introduce-suggestion
The 8991 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../editor/verification/IntroduceSuggestion.java | 10 +-
.../{ => testEnumCase}/testEnumCase.php| 0
.../testEnumCase.php.testEnumCase_01.hints | 0
.../testEnumCase.php.testEnumCase_02.hints | 0
.../testEnumCase.php.testEnumCase_03.hints | 0
.../testEnumCase.php.testEnumCase_Fix01a.fixed}| 0
.../testEnumCase.php.testEnumCase_Fix01b.fixed}| 0
.../testEnumCase.php.testEnumCase_Fix02a.fixed}| 0
.../testEnumCase.php.testEnumCase_Fix02b.fixed}| 0
.../testEnumCase.php.testEnumCase_Fix03a.fixed}| 0
.../testEnumCase.php.testEnumCase_Fix03b.fixed}| 0
.../{ => testEnumMethods}/testEnumMethods.php | 0
.../testEnumMethods.php.testEnumMethods_01.hints | 0
.../testEnumMethods.php.testEnumMethods_02.hints | 0
.../testEnumMethods.php.testEnumMethods_03.hints | 0
.../testEnumMethods.php.testEnumMethods_04.hints | 0
.../testEnumMethods.php.testEnumMethods_05.hints | 0
.../testEnumMethods.php.testEnumMethods_06.hints | 0
...estEnumMethods.php.testEnumMethods_Fix01.fixed} | 0
...estEnumMethods.php.testEnumMethods_Fix02.fixed} | 0
...estEnumMethods.php.testEnumMethods_Fix03.fixed} | 0
...estEnumMethods.php.testEnumMethods_Fix04.fixed} | 0
...estEnumMethods.php.testEnumMethods_Fix05.fixed} | 0
...estEnumMethods.php.testEnumMethods_Fix06.fixed} | 0
.../{testEnumCase.php => testGH6258/TestClass.php} | 32 +-
.../testGH6258_01.php} | 33 +-
.../testGH6258_01.php.testGH6258_01.hints | 4 +
.../testGH6258_01.php.testGH6258_01Fix.fixed} | 33 +-
.../testGH6258_02.php} | 34 +--
.../testGH6258_02.php.testGH6258_02.hints | 4 +
.../testGH6258_02.php.testGH6258_02Fix.fixed} | 34 +--
.../{testEnumCase.php => testGH6266/TestClass.php} | 32 +-
.../testGH6266.php}| 35 +--
.../testGH6266.php.testGH6266_Const.hints | 4 +
.../testGH6266.php.testGH6266_ConstFix.fixed} | 35 +--
.../testGH6266.php.testGH6266_Field.hints | 4 +
.../testGH6266.php.testGH6266_FieldFix.fixed} | 35 +--
.../testGH6266.php.testGH6266_StaticField.hints| 4 +
...testGH6266.php.testGH6266_StaticFieldFix.fixed} | 35 +--
.../testGH6266_02.php} | 32 +-
.../testIntroduceSuggestion.php| 0
...Suggestion.php.testIntroduceSuggestion_01.hints | 4 +
...Suggestion.php.testIntroduceSuggestion_02.hints | 0
...Suggestion.php.testIntroduceSuggestion_03.hints | 0
...Suggestion.php.testIntroduceSuggestion_04.hints | 0
...Suggestion.php.testIntroduceSuggestion_05.hints | 0
...Suggestion.php.testIntroduceSuggestion_06.hints | 0
...Suggestion.php.testIntroduceSuggestion_07.hints | 0
...estion.php.testIntroduceSuggestion_Fix02.fixed} | 0
...estion.php.testIntroduceSuggestion_Fix03.fixed} | 0
...estion.php.testIntroduceSuggestion_Fix04.fixed} | 0
...estion.php.testIntroduceSuggestion_Fix05.fixed} | 0
...estion.php.testIntroduceSuggestion_Fix06.fixed} | 0
.../testIssue223842}/testIssue223842.php | 0
.../testIssue223842.php.testIssue223842.hints | 0
.../testIssue239277}/Issue239277.php | 0
.../testIssue239277}/testIssue239277.php | 0
.../testIssue239277.php.testIssue239277_01.hints | 0
.../testIssue239277.php.testIssue239277_02.hints | 0
.../testIssue241824}/testIssue241824.php | 0
.../testIssue241824.php.testIssue241824_01.hints | 0
.../testIssue241824.php.testIssue241824_02.hints | 0
.../testSpecialTypes/testSpecialTypes.php} | 0
.../testSpecialTypes.php.testSpecialTypes_01.hints | 0
.../testSpecialTypes.php.testSpecialTypes_02.hints | 0
.../testSpecialTypes.php.testSpecialTypes_03.hints | 0
.../testTrait/testTrait.php} | 0
.../testTrait.php.testTrait_Constant.hints | 0
.../testTrait/testTrait.php.testTrait_Field.hints | 4 +
.../testTrait.php.testTrait_FixField.fixed}| 0
.../testTrait.php.testTrait_FixMethod.fixed} | 0
[netbeans] branch master updated: Prevent getting an incorrect type if a return type is `static` with PHPDoc tag(`@return`) #6247
This is an automated email from the ASF dual-hosted git repository.
junichi11 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 60461afab6 Prevent getting an incorrect type if a return type is
`static` with PHPDoc tag(`@return`) #6247
new fbd6ddd2fb Merge pull request #6251 from
junichi11/php-gh-6247-wrong-suggestion-for-fix-imports
60461afab6 is described below
commit 60461afab6dd315ca55f4d1d63eb2bc526b904a5
Author: Junichi Yamamoto
AuthorDate: Tue Jul 25 10:49:24 2023 +0900
Prevent getting an incorrect type if a return type is `static` with PHPDoc
tag(`@return`) #6247
- https://github.com/apache/netbeans/issues/6247
- Ignore `static` only when a PHPDoc tag is `@method`
- Add a unit test
---
.../php/editor/parser/PHPDocCommentParser.java | 23 ++-
.../testfiles/actions/testGH6247/testGH6247_01.php | 34 ++
.../testGH6247/testGH6247_01.php.importData| 12
.../php/editor/actions/ImportDataCreatorTest.java | 4 +++
4 files changed, 65 insertions(+), 8 deletions(-)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/parser/PHPDocCommentParser.java
b/php/php.editor/src/org/netbeans/modules/php/editor/parser/PHPDocCommentParser.java
index 64c9c3417e..6ba3e14cbf 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/parser/PHPDocCommentParser.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/parser/PHPDocCommentParser.java
@@ -202,8 +202,7 @@ public class PHPDocCommentParser {
private PHPDocTag createTag(int start, int end, AnnotationParsedLine type,
String description, String originalComment, int originalCommentStart) {
final Map types = type.getTypes();
if (types.isEmpty()) {
-boolean isReturnTag = type.equals(PHPDocTag.Type.RETURN);
-List docTypes = findTypes(description, start,
originalComment, originalCommentStart, isReturnTag);
+List docTypes = findTypes(description, start,
originalComment, originalCommentStart, type);
if (PHP_DOC_VAR_TYPE_TAGS.contains(type)) {
String variable = getVaribleName(description);
PHPDocNode varibaleNode = null;
@@ -252,16 +251,16 @@ public class PHPDocCommentParser {
}
private List findTypes(String description, int
startDescription, String originalComment, int originalCommentStart) {
-return findTypes(description, startDescription, originalComment,
originalCommentStart, false);
+return findTypes(description, startDescription, originalComment,
originalCommentStart, PHPDocTypeTag.Type.PARAM);
}
-private List findTypes(String description, int
startDescription, String originalComment, int originalCommentStart, boolean
isReturnTag) {
+private List findTypes(String description, int
startDescription, String originalComment, int originalCommentStart,
AnnotationParsedLine tagType) {
if (StringUtils.isEmpty(description)) {
return Collections.emptyList();
}
List result = new ArrayList<>();
-for (String stype : getTypes(description, isReturnTag)) {
+for (String stype : getTypes(description, tagType)) {
stype = removeHTMLTags(stype);
stype = sanitizeShapes(stype);
int startDocNode = findStartOfDocNode(originalComment,
originalCommentStart, stype, startDescription);
@@ -288,13 +287,13 @@ public class PHPDocCommentParser {
return result;
}
-private List getTypes(String description, boolean isReturnTag) {
+private List getTypes(String description, AnnotationParsedLine
tagType) {
String[] tokens = description.trim().split("[ ]+"); //NOI18N
-if (tokens.length > 0 && tokens[0].equals("static")) { // NOI18N
+if (isMethodTag(tagType) && tokens.length > 0 &&
tokens[0].equals(Type.STATIC)) {
tokens = Arrays.copyOfRange(tokens, 1, tokens.length);
}
ArrayList types = new ArrayList<>();
-if (tokens.length > 0 && (isReturnTag || !tokens[0].startsWith("$")))
{ //NOI18N
+if (tokens.length > 0 && (isReturnTag(tagType) ||
!tokens[0].startsWith("$"))) { //NOI18N
if (tokens[0].indexOf('|') > -1 || tokens[0].indexOf('&') > -1) {
String[] ttokens = tokens[0].split("[|&]"); //NOI18N
for (String ttoken : ttokens) {
@@ -473,6 +472,14 @@ public class PHPDocCommentParser {
return result;
}
+private static boolean isReturnTag(AnnotationParsedLine type) {
+return PHPDocTypeTag.Type.RETURN == type;
+}
+
+private static boolean isMethodTag(AnnotationParsedLine type) {
+return PHPDocTypeTag.Type.METHOD == type;
+}
+
private static final class ParametersExtractorImpl implements
ParametersExtractor {
private int
[netbeans-mavenutils-nbm-maven-plugin] branch dependabot/maven/master/org.slf4j-slf4j-simple-2.0.7 created (now cfaba4e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/org.slf4j-slf4j-simple-2.0.7 in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git at cfaba4e Bump org.slf4j:slf4j-simple from 1.7.36 to 2.0.7 No new revisions were added by this update. - 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
[netbeans-mavenutils-nbm-maven-plugin] branch dependabot/maven/master/org.mockito-mockito-core-5.5.0 created (now 643e9d2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/org.mockito-mockito-core-5.5.0 in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git at 643e9d2 Bump org.mockito:mockito-core from 4.8.1 to 5.5.0 No new revisions were added by this update. - 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
[netbeans-mavenutils-nbm-maven-plugin] branch dependabot/maven/nbm-maven-plugin/org.codehaus.plexus-plexus-archiver-4.8.0 deleted (was 3c88ba2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nbm-maven-plugin/org.codehaus.plexus-plexus-archiver-4.8.0 in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git was 3c88ba2 Bump org.codehaus.plexus:plexus-archiver in /nbm-maven-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - 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
[netbeans-mavenutils-nbm-maven-plugin] branch dependabot/maven/master/org.codehaus.plexus-plexus-archiver-4.8.0 deleted (was 74e7aaf)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/org.codehaus.plexus-plexus-archiver-4.8.0 in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git was 74e7aaf Bump org.codehaus.plexus:plexus-archiver from 4.7.1 to 4.8.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - 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
[netbeans-mavenutils-nbm-maven-plugin] 01/01: Merge pull request #102 from apache/dependabot/maven/nbm-maven-plugin/org.codehaus.plexus-plexus-archiver-4.8.0
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git commit 2a4aff6c79660ca8ee216e951bcd48c94573e765 Merge: 4763657 3c88ba2 Author: Eric Barboni AuthorDate: Tue Aug 29 14:17:01 2023 +0200 Merge pull request #102 from apache/dependabot/maven/nbm-maven-plugin/org.codehaus.plexus-plexus-archiver-4.8.0 Bump org.codehaus.plexus:plexus-archiver from 4.7.1 to 4.8.0 in /nbm-maven-plugin - 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
[netbeans-mavenutils-nbm-maven-plugin] branch master updated (4763657 -> 2a4aff6)
This is an automated email from the ASF dual-hosted git repository. skygo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git from 4763657 Merge pull request #103 from apache/dependabot/maven/master/org.codehaus.plexus-plexus-archiver-4.8.0 add 3c88ba2 Bump org.codehaus.plexus:plexus-archiver in /nbm-maven-plugin new 2a4aff6 Merge pull request #102 from apache/dependabot/maven/nbm-maven-plugin/org.codehaus.plexus-plexus-archiver-4.8.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: - 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
[netbeans-mavenutils-nbm-maven-plugin] branch master updated (df812eb -> 4763657)
This is an automated email from the ASF dual-hosted git repository. skygo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git from df812eb Merge pull request #105 from apache/dependabot/maven/master/org.apache.ant-ant-1.10.14 add 74e7aaf Bump org.codehaus.plexus:plexus-archiver from 4.7.1 to 4.8.0 add 4763657 Merge pull request #103 from apache/dependabot/maven/master/org.codehaus.plexus-plexus-archiver-4.8.0 No new revisions were added by this update. Summary of changes: nbm-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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
[netbeans-mavenutils-nbm-maven-plugin] branch dependabot/maven/master/org.codehaus.plexus-plexus-archiver-4.8.0 updated (e930570 -> 74e7aaf)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/org.codehaus.plexus-plexus-archiver-4.8.0 in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git discard e930570 Bump org.codehaus.plexus:plexus-archiver from 4.7.1 to 4.8.0 add 264a70f Make them Maven3 plugins add 5a809ae Typos in trace add d0974ed Make UT do assert add 59e4d41 Go step by step, too big do it at once. add db6fd20 Add prerequisite add 539e025 Merge pull request #104 from cstamas/make-it-mvn3-plugin add 74e7aaf Bump org.codehaus.plexus:plexus-archiver from 4.7.1 to 4.8.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e930570) \ N -- N -- N refs/heads/dependabot/maven/master/org.codehaus.plexus-plexus-archiver-4.8.0 (74e7aaf) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .gitignore | 2 + nb-repository-plugin/pom.xml | 35 ++-- .../nbm/repository/PopulateRepositoryMojo.java | 207 + .../nbm/repository/PopulateRepositoryMojoTest.java | 74 ++-- 4 files changed, 167 insertions(+), 151 deletions(-) - 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
[netbeans-mavenutils-nbm-maven-plugin] branch dependabot/maven/master/org.apache.ant-ant-1.10.14 deleted (was acf4ebf)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/org.apache.ant-ant-1.10.14 in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git was acf4ebf Bump org.apache.ant:ant from 1.10.13 to 1.10.14 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - 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
[netbeans-mavenutils-nbm-maven-plugin] branch dependabot/maven/nbm-maven-plugin/org.codehaus.plexus-plexus-archiver-4.8.0 updated (0fa6960 -> 3c88ba2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nbm-maven-plugin/org.codehaus.plexus-plexus-archiver-4.8.0 in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git omit 0fa6960 Bump org.codehaus.plexus:plexus-archiver in /nbm-maven-plugin add 264a70f Make them Maven3 plugins add 5a809ae Typos in trace add d0974ed Make UT do assert add 59e4d41 Go step by step, too big do it at once. add db6fd20 Add prerequisite add 539e025 Merge pull request #104 from cstamas/make-it-mvn3-plugin add 3c88ba2 Bump org.codehaus.plexus:plexus-archiver in /nbm-maven-plugin This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0fa6960) \ N -- N -- N refs/heads/dependabot/maven/nbm-maven-plugin/org.codehaus.plexus-plexus-archiver-4.8.0 (3c88ba2) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .gitignore | 2 + nb-repository-plugin/pom.xml | 35 ++-- .../nbm/repository/PopulateRepositoryMojo.java | 207 + .../nbm/repository/PopulateRepositoryMojoTest.java | 74 ++-- 4 files changed, 167 insertions(+), 151 deletions(-) - 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
[netbeans-mavenutils-nbm-maven-plugin] branch master updated (539e025 -> df812eb)
This is an automated email from the ASF dual-hosted git repository. skygo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git from 539e025 Merge pull request #104 from cstamas/make-it-mvn3-plugin add acf4ebf Bump org.apache.ant:ant from 1.10.13 to 1.10.14 new df812eb Merge pull request #105 from apache/dependabot/maven/master/org.apache.ant-ant-1.10.14 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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
[netbeans-mavenutils-nbm-maven-plugin] 01/01: Merge pull request #105 from apache/dependabot/maven/master/org.apache.ant-ant-1.10.14
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git commit df812eb70474a0dc83d71eb6785c73018ab8066c Merge: 539e025 acf4ebf Author: Eric Barboni AuthorDate: Tue Aug 29 14:16:28 2023 +0200 Merge pull request #105 from apache/dependabot/maven/master/org.apache.ant-ant-1.10.14 Bump org.apache.ant:ant from 1.10.13 to 1.10.14 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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
[netbeans-mavenutils-nbm-maven-plugin] branch master updated (942dd73 -> 539e025)
This is an automated email from the ASF dual-hosted git repository. skygo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git from 942dd73 Merge pull request #101 from ebarboni/sitefix new 264a70f Make them Maven3 plugins new 5a809ae Typos in trace new d0974ed Make UT do assert new 59e4d41 Go step by step, too big do it at once. new db6fd20 Add prerequisite new 539e025 Merge pull request #104 from cstamas/make-it-mvn3-plugin The 1573 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 2 + nb-repository-plugin/pom.xml | 35 ++-- .../nbm/repository/PopulateRepositoryMojo.java | 207 + .../nbm/repository/PopulateRepositoryMojoTest.java | 74 ++-- 4 files changed, 167 insertions(+), 151 deletions(-) - 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
[netbeans] branch master updated: Fixed gap between checkboxes in php project testing settings
This is an automated email from the ASF dual-hosted git repository.
junichi11 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 30af44cb44 Fixed gap between checkboxes in php project testing settings
new 28d308b400 Merge pull request #6381 from
troizet/php_testing_settings_checkboxes
30af44cb44 is described below
commit 30af44cb4487eaf827120fcd74dde5bb225be535
Author: Alexey Borokhvostov
AuthorDate: Mon Aug 28 21:45:12 2023 +0700
Fixed gap between checkboxes in php project testing settings
---
.../modules/php/project/ui/customizer/CustomizerTesting.java | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git
a/php/php.project/src/org/netbeans/modules/php/project/ui/customizer/CustomizerTesting.java
b/php/php.project/src/org/netbeans/modules/php/project/ui/customizer/CustomizerTesting.java
index 1b80475ff4..41c6c6f603 100644
---
a/php/php.project/src/org/netbeans/modules/php/project/ui/customizer/CustomizerTesting.java
+++
b/php/php.project/src/org/netbeans/modules/php/project/ui/customizer/CustomizerTesting.java
@@ -133,7 +133,6 @@ public class CustomizerTesting extends JPanel {
GroupLayout providersPanelLayout = new GroupLayout(providersPanel);
GroupLayout.ParallelGroup horizontalGroup =
providersPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
GroupLayout.SequentialGroup verticalGroup =
providersPanelLayout.createSequentialGroup();
-boolean first = true;
final Collator collator = Collator.getInstance();
Collections.sort(allTestingProviders, new
Comparator() {
@Override
@@ -150,11 +149,7 @@ public class CustomizerTesting extends JPanel {
}
horizontalGroup.addComponent(checkBox);
verticalGroup.addComponent(checkBox);
-if (first) {
-first = false;
-} else {
-
verticalGroup.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
-}
+
verticalGroup.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
}
providersPanel.setLayout(providersPanelLayout);
providersPanelLayout.setHorizontalGroup(
-
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
