[netbeans] branch master updated: [GH-5355] PHP: Corrects the display of the guessed return type for a function or method in the documentation
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 e71087302b [GH-5355] PHP: Corrects the display of the guessed return
type for a function or method in the documentation
new 7c9c4bcfb0 Merge pull request #5779 from troizet/fix_gh_5355
e71087302b is described below
commit e71087302b58795b7d8af53afb9763da756305ce
Author: Alexey Borokhvostov
AuthorDate: Wed Apr 5 22:50:37 2023 +0700
[GH-5355] PHP: Corrects the display of the guessed return type for a
function or method in the documentation
---
.../modules/php/editor/completion/DocRenderer.java | 12 +--
.../completion/documentation/issueGH5355.php | 42 ++
.../issueGH5355.php.testIssueGH5355_01.html| 13 +++
.../issueGH5355.php.testIssueGH5355_02.html| 13 +++
.../editor/completion/PHPCCDocumentationTest.java | 8 +
5 files changed, 85 insertions(+), 3 deletions(-)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/completion/DocRenderer.java
b/php/php.editor/src/org/netbeans/modules/php/editor/completion/DocRenderer.java
index a42ed5c4ab..c16340c68a 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/completion/DocRenderer.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/completion/DocRenderer.java
@@ -608,9 +608,15 @@ final class DocRenderer {
if (type.isResolved()) {
QualifiedName typeName = type.getTypeName(true);
if (typeName != null) {
-if (sb.length() > 0
-&& (typeKind == Type.Kind.UNION || typeKind ==
Type.Kind.INTERSECTION)) {
-sb.append(" ").append(typeKind.getSign()).append("
"); // NOI18N
+if (sb.length() > 0) {
+if (typeKind == Type.Kind.INTERSECTION) {
+sb.append("
").append(typeKind.getSign()).append(" "); // NOI18N
+} else {
+//GH-5355: If a function returns multiple
types
+//and doesn't have a declared return type,
+//it's always a union type.
+sb.append("
").append(Type.Kind.UNION.getSign()).append(" "); // NOI18N
+}
}
if (type.isNullableType()) {
sb.append(CodeUtils.NULLABLE_TYPE_PREFIX);
diff --git
a/php/php.editor/test/unit/data/testfiles/completion/documentation/issueGH5355.php
b/php/php.editor/test/unit/data/testfiles/completion/documentation/issueGH5355.php
new file mode 100644
index 00..82833f80aa
--- /dev/null
+++
b/php/php.editor/test/unit/data/testfiles/completion/documentation/issueGH5355.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 ClassName {
+
+public function testMethod($a) {
+if ($a) {
+return 1;
+}
+return 'str';
+}
+
+public function test() {
+$this->testMethod(null);
+}
+}
+
+function testFunction($a) {
+if ($a) {
+return 1;
+}
+return 'str';
+}
+
+testFunction(null);
diff --git
a/php/php.editor/test/unit/data/testfiles/completion/documentation/issueGH5355.php.testIssueGH5355_01.html
b/php/php.editor/test/unit/data/testfiles/completion/documentation/issueGH5355.php.testIssueGH5355_01.html
new file mode 100644
index 00..527c6112c4
--- /dev/null
+++
b/php/php.editor/test/unit/data/testfiles/completion/documentation/issueGH5355.php.testIssueGH5355_01.html
@@ -0,0 +1,13 @@
+
+Code completion result for source line:
+$this->testMetho|d(null);
+(QueryType=COMPLETION, prefixSearch=false, caseSensitive=true)
+METHOD testMethod($a) [PUBLIC] ClassName
+Documentation:testMethod
+Parameters:
+
+$aPHPDoc not
found
+
+Returns:
+
+Type:string | int
diff --git
a/php/php.editor/test/unit/data/testfiles/completion/documentation/issueGH5355.php.testIssueGH5355_02.html
b/php/php.editor/test/unit/data/testfiles/completion/documentation/issueGH5355.php.testIssueGH5355_02.html
new file mode 100644
index 00..ad2f8cf126
--- /dev/null
+++
b/php/php.editor/test/unit/data/testfiles/completion/documentation/issueGH5355.php.testIssueGH5355_02.html
@@ -0,0 +1,13 @@
+
+Code completion result for source line:
[netbeans-jenkins-lib] branch master updated: removing "deprecated section"
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-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 653bb77 removing "deprecated section"
653bb77 is described below
commit 653bb77f46f8b28fd9d3725b20160e422fc749a2
Author: Eric Barboni
AuthorDate: Fri Apr 7 00:47:42 2023 +0200
removing "deprecated section"
---
jobs/netbeansreleasetlp.groovy | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/jobs/netbeansreleasetlp.groovy b/jobs/netbeansreleasetlp.groovy
index 1759ae3..e9854ca 100755
--- a/jobs/netbeansreleasetlp.groovy
+++ b/jobs/netbeansreleasetlp.groovy
@@ -35,6 +35,7 @@ organizationFolder('NetBeans/netbeans-TLP') {
}
}
}
+/* seems no accessible
buildStrategies {
buildNamedBranches {
filters {
@@ -44,7 +45,7 @@ organizationFolder('NetBeans/netbeans-TLP') {
}
}
}
-}
+} */
projectFactories {
workflowMultiBranchProjectFactory {
// Relative location within the checkout of our Pipeline
script.
-
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-jenkins-lib] branch master updated: try organization folder for release job
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-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 488416f try organization folder for release job
488416f is described below
commit 488416fcf010b4c8c555f93ec84deaaa7ca14f2f
Author: Eric Barboni
AuthorDate: Thu Apr 6 17:59:03 2023 +0200
try organization folder for release job
---
jobs/netbeansreleasetlp.groovy | 30 --
1 file changed, 12 insertions(+), 18 deletions(-)
diff --git a/jobs/netbeansreleasetlp.groovy b/jobs/netbeansreleasetlp.groovy
index 2040ab9..1759ae3 100755
--- a/jobs/netbeansreleasetlp.groovy
+++ b/jobs/netbeansreleasetlp.groovy
@@ -20,26 +20,21 @@
organizationFolder('NetBeans/netbeans-TLP') {
description('Apache NetBeans release jobs and apidoc generation for
historical version')
displayName('NetBeans-TLP')
-
organizations {
-configure {
-def asf = it / navigators /
'org.apache.jenkins.gitpubsub.ASFGitSCMNavigator'
-asf << {
-server ('https://gitbox.apache.org/repos/asf')
-}
-def traits = asf / traits
-traits <<
'org.apache.jenkins.gitpubsub.ASFMetadataSCMNavigatorTrait' {
-avatarUrl('https://netbeans.apache.org/images/nblogo32x32.png')
-}
-traits << 'jenkins.scm.impl.trait.WildcardSCMSourceFilterTrait' {
-includes('netbeans')
-}
-traits << 'jenkins.plugins.git.traits.BranchDiscoveryTrait' {}
-traits << 'jenkins.scm.impl.trait.RegexSCMHeadFilterTrait' {
-
regex('(master|release\\d+$|vsnetbeans_preview_\\d+$|vsnetbeans_\\d+$)')
+fromSource {
+name ('NetBeans')
+sources {
+git {
+remote ('https://github.com/apache/netbeans')
+traits {
+gitBranchDiscovery()
+headRegexFilter {
+
regex('(master|release\\d+$|vsnetbeans_preview_\\d+$|vsnetbeans_\\d+$)')
+}
+}
+}
}
}
-
buildStrategies {
buildNamedBranches {
filters {
@@ -62,7 +57,6 @@ organizationFolder('NetBeans/netbeans-TLP') {
daysToKeep(5)
}
}
-
triggers {
periodicFolderTrigger {
interval("1d")
-
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-jenkins-lib] branch master updated: regex changes
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-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 9b3d90f regex changes
9b3d90f is described below
commit 9b3d90f9d41d454239c0d10069b89d631456cf17
Author: Eric Barboni
AuthorDate: Thu Apr 6 16:37:09 2023 +0200
regex changes
---
jobs/netbeansreleasetlp.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jobs/netbeansreleasetlp.groovy b/jobs/netbeansreleasetlp.groovy
index b5dd545..2040ab9 100755
--- a/jobs/netbeansreleasetlp.groovy
+++ b/jobs/netbeansreleasetlp.groovy
@@ -44,7 +44,7 @@ organizationFolder('NetBeans/netbeans-TLP') {
buildNamedBranches {
filters {
regex {
-regex('(master|release\\d+$|vsnetbeans_preview_\\d+$)')
+
regex('(master|release\\d+$|vsnetbeans_preview_\\d+$|vsnetbeans_\\d+$)')
caseSensitive(false)
}
}
-
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] 04/04: Force refresh of live subprojects when parent recovers from broken. (#5781)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch vsnetbeans_1703
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 6fb42ee82bcf38615cd37d4efd5922ec71508be8
Author: Svatopluk Dedic
AuthorDate: Thu Apr 6 07:20:43 2023 -0700
Force refresh of live subprojects when parent recovers from broken. (#5781)
Force refresh of live subprojects when parent recovers from broken.
---
.../netbeans/modules/maven/NbMavenProjectImpl.java | 51 ++-
.../maven/modelcache/MavenProjectCache.java| 58 +-
.../maven/problems/MavenModelProblemsProvider.java | 1 +
3 files changed, 107 insertions(+), 3 deletions(-)
diff --git a/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java
b/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java
index b8caf9c811..7d753e2185 100644
--- a/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java
+++ b/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java
@@ -71,6 +71,7 @@ import org.netbeans.api.annotations.common.NullUnknown;
import org.netbeans.api.java.project.classpath.ProjectClassPathModifier;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectActionContext;
+import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.queries.VisibilityQuery;
import org.netbeans.modules.maven.api.Constants;
import org.netbeans.modules.maven.api.FileUtilities;
@@ -134,8 +135,9 @@ public final class NbMavenProjectImpl implements Project {
public void run() {
problemReporter.clearReports(); //#167741 -this will trigger node
refresh?
MavenProject prj = loadOriginalMavenProject(true);
+MavenProject old;
synchronized (NbMavenProjectImpl.this) {
-MavenProject old = project == null ? null : project.get();
+old = project == null ? null : project.get();
if (old != null && MavenProjectCache.isFallbackproject(prj)) {
prj.setPackaging(old.getPackaging()); //#229366 preserve
packaging for broken projects to avoid changing lookup.
}
@@ -146,6 +148,7 @@ public final class NbMavenProjectImpl implements Project {
projectVariants.clear();
}
ACCESSOR.doFireReload(watcher);
+reloadPossibleBrokenModules(old, prj);
}
});
private final FileObject fileObject;
@@ -552,6 +555,52 @@ public final class NbMavenProjectImpl implements Project {
}
return reloadTask;
}
+
+private void reloadPossibleBrokenModules(MavenProject preceding,
MavenProject p) {
+// restrict to just poms that were marked as broken/incomplete.
+if (!(MavenProjectCache.isFallbackproject(preceding) ||
+
preceding.getContextValue("org.netbeans.modules.maven.problems.primingNotDone")
!= Boolean.TRUE)) {
+return;
+}
+// but do not cascade from projects, which are themselves broken.
+if (MavenProjectCache.isFallbackproject(p)) {
+return;
+}
+File basePOMFile = p.getFile().getParentFile();
+for (String modName : p.getModules()) {
+File modPom = new File(new File(basePOMFile, modName), "pom.xml");
+if (!modPom.exists() || !modPom.isFile()) {
+LOG.log(Level.FINE, "POM file {0} for module {1} does not
exist", new Object[] { modPom, modName });
+continue;
+}
+MavenProject child = MavenProjectCache.getMavenProject(modPom,
true, false);
+if (child == null) {
+continue;
+}
+// the project may have more problems, more subtle, but now repair
just total breakage
+if (!MavenProjectCache.isFallbackproject(child)) {
+LOG.log(Level.FINE, "Project for module {0} is not a fallback,
skipping", modName);
+}
+FileObject dir = FileUtil.toFileObject(modPom.getParentFile());
+if (dir == null) {
+LOG.log(Level.FINE, "Project directory for {0} is not a
FileObject", modName);
+continue;
+}
+try {
+Project c = ProjectManager.getDefault().findProject(dir);
+if (c == null) {
+LOG.log(Level.FINE, "Module {0} is not a project",
modName);
+} else {
+LOG.log(Level.INFO, "Recovering module {0}, pomfile {1}",
new Object[] { modName, modPom });
+NbMavenProjectImpl childImpl =
c.getLookup().lookup(NbMavenProjectImpl.class);
+childImpl.fireProjectReload();
+}
+} catch (IOException ex) {
+LOG.log(Level.FINE, "Error getting module project {0} is not a
project", modName);
+LOG.log(Level.FINE,
[netbeans] 01/04: Report empty set if project does not use buildscript; prevent NPE.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch vsnetbeans_1703
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit e4f9921c788290c9695cd745fcdd077d4af0c634
Author: Svata Dedic
AuthorDate: Mon Apr 3 09:37:36 2023 +0200
Report empty set if project does not use buildscript; prevent NPE.
---
.../modules/gradle/java/queries/GradleDependencyResult.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependencyResult.java
b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependencyResult.java
index eeeffd9152..11ab21d663 100644
---
a/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependencyResult.java
+++
b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependencyResult.java
@@ -230,7 +230,11 @@ public final class GradleDependencyResult implements
DependencyResult, PropertyC
@Override
public Collection getDependencyFiles() {
-FileObject fo =
FileUtil.toFileObject(gp.getGradleFiles().getBuildScript());
+File f = gp.getGradleFiles().getBuildScript();
+if (f == null) {
+return Collections.emptyList();
+}
+FileObject fo = FileUtil.toFileObject(f);
return fo == null ? Collections.emptyList() :
Collections.singletonList(fo);
}
-
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] 02/04: Try to match versionless direct children to resolved dependencies.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch vsnetbeans_1703
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 2b4ad96536328d46429660daed0c5317091e01f2
Author: Svata Dedic
AuthorDate: Tue Apr 4 16:52:46 2023 +0200
Try to match versionless direct children to resolved dependencies.
---
.../modules/gradle/api/GradleBaseProjectBuilder.java | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
index 03c3a98aec..44e5ae86fa 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
@@ -322,11 +322,14 @@ class GradleBaseProjectBuilder implements
ProjectInfoExtractor.Result {
String parentId = it.getKey();
GradleDependency parentD;
+boolean special = false;
if (parentId.equals("")) {
parentD = GradleConfiguration.SELF_DEPENDENCY;
+special = true;
} else if (parentId.startsWith(DEPENDENCY_PROJECT_PREFIX))
{
int sep1 = parentId.indexOf(':',
DEPENDENCY_PROJECT_PREFIX.length());
parentD =
projects.get(parentId.substring(DEPENDENCY_PROJECT_PREFIX.length(), sep1));
+special = true;
} else {
parentD = components.get(parentId);
if (parentD == null) {
@@ -339,7 +342,17 @@ class GradleBaseProjectBuilder implements
ProjectInfoExtractor.Result {
if (childSpecs.remove(parentId)) {
children.add(parentD);
-
+} else if (!special) {
+// special case - version may not be specified, but is
implied somehow.
+try {
+String[] gav =
GradleModuleFileCache21.gavSplit(parentId);
+String versionLess = gav[0] + ':' + gav[1] + ':';
+if (childSpecs.remove(versionLess)) {
+children.add(parentD);
+}
+} catch (IllegalArgumentException ex) {
+LOG.log(Level.FINE, "Unknown dependency GAV:
parentId");
+}
}
for (String cid : it.getValue()) {
-
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 vsnetbeans_1703 updated (fd55937d5d -> 6fb42ee82b)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch vsnetbeans_1703 in repository https://gitbox.apache.org/repos/asf/netbeans.git from fd55937d5d VSNetBeans changelog update for 17.0.301 (#5782) new e4f9921c78 Report empty set if project does not use buildscript; prevent NPE. new 2b4ad96536 Try to match versionless direct children to resolved dependencies. new c7dbd96610 If no origin is reported, pretend this configuration defines the dependency to prevent NPEs later. new 6fb42ee82b Force refresh of live subprojects when parent recovers from broken. (#5781) The 4 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: .../gradle/api/GradleBaseProjectBuilder.java | 15 +- .../queries/GradleDependenciesImplementation.java | 4 ++ .../java/queries/GradleDependencyResult.java | 6 ++- .../netbeans/modules/maven/NbMavenProjectImpl.java | 51 ++- .../maven/modelcache/MavenProjectCache.java| 58 +- .../maven/problems/MavenModelProblemsProvider.java | 1 + 6 files changed, 130 insertions(+), 5 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] 03/04: If no origin is reported, pretend this configuration defines the dependency to prevent NPEs later.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch vsnetbeans_1703
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit c7dbd966107333c62ffac410f56f980eea8fe7d1
Author: Svata Dedic
AuthorDate: Tue Apr 4 16:53:17 2023 +0200
If no origin is reported, pretend this configuration defines the dependency
to prevent NPEs later.
---
.../modules/gradle/java/queries/GradleDependenciesImplementation.java | 4
1 file changed, 4 insertions(+)
diff --git
a/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependenciesImplementation.java
b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependenciesImplementation.java
index af4f87ec52..d26ba5c04c 100644
---
a/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependenciesImplementation.java
+++
b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependenciesImplementation.java
@@ -184,6 +184,10 @@ public class GradleDependenciesImplementation implements
ProjectDependenciesImpl
for (GradleDependency dep : cfg.getDependencies()) {
this.cfg = cfg.getDependencyOrigin(dep);
+if (this.cfg == null) {
+// safeguard: we cannot determine the origin, so let's
assume this configuration defines the dependency
+this.cfg = cfg;
+}
List ch = processLevel(cfg, dep, new
HashSet<>());
Dependency n = createDependency(dep, ch);
rootDeps.add(n);
-
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: Force refresh of live subprojects when parent recovers from broken. (#5781)
This is an automated email from the ASF dual-hosted git repository.
sdedic 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 0bcc927866 Force refresh of live subprojects when parent recovers from
broken. (#5781)
0bcc927866 is described below
commit 0bcc927866938e6c7f57e1bfe8f852e983b3072f
Author: Svatopluk Dedic
AuthorDate: Thu Apr 6 07:20:43 2023 -0700
Force refresh of live subprojects when parent recovers from broken. (#5781)
Force refresh of live subprojects when parent recovers from broken.
---
.../netbeans/modules/maven/NbMavenProjectImpl.java | 51 ++-
.../maven/modelcache/MavenProjectCache.java| 58 +-
.../maven/problems/MavenModelProblemsProvider.java | 1 +
3 files changed, 107 insertions(+), 3 deletions(-)
diff --git a/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java
b/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java
index b8caf9c811..7d753e2185 100644
--- a/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java
+++ b/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java
@@ -71,6 +71,7 @@ import org.netbeans.api.annotations.common.NullUnknown;
import org.netbeans.api.java.project.classpath.ProjectClassPathModifier;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectActionContext;
+import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.queries.VisibilityQuery;
import org.netbeans.modules.maven.api.Constants;
import org.netbeans.modules.maven.api.FileUtilities;
@@ -134,8 +135,9 @@ public final class NbMavenProjectImpl implements Project {
public void run() {
problemReporter.clearReports(); //#167741 -this will trigger node
refresh?
MavenProject prj = loadOriginalMavenProject(true);
+MavenProject old;
synchronized (NbMavenProjectImpl.this) {
-MavenProject old = project == null ? null : project.get();
+old = project == null ? null : project.get();
if (old != null && MavenProjectCache.isFallbackproject(prj)) {
prj.setPackaging(old.getPackaging()); //#229366 preserve
packaging for broken projects to avoid changing lookup.
}
@@ -146,6 +148,7 @@ public final class NbMavenProjectImpl implements Project {
projectVariants.clear();
}
ACCESSOR.doFireReload(watcher);
+reloadPossibleBrokenModules(old, prj);
}
});
private final FileObject fileObject;
@@ -552,6 +555,52 @@ public final class NbMavenProjectImpl implements Project {
}
return reloadTask;
}
+
+private void reloadPossibleBrokenModules(MavenProject preceding,
MavenProject p) {
+// restrict to just poms that were marked as broken/incomplete.
+if (!(MavenProjectCache.isFallbackproject(preceding) ||
+
preceding.getContextValue("org.netbeans.modules.maven.problems.primingNotDone")
!= Boolean.TRUE)) {
+return;
+}
+// but do not cascade from projects, which are themselves broken.
+if (MavenProjectCache.isFallbackproject(p)) {
+return;
+}
+File basePOMFile = p.getFile().getParentFile();
+for (String modName : p.getModules()) {
+File modPom = new File(new File(basePOMFile, modName), "pom.xml");
+if (!modPom.exists() || !modPom.isFile()) {
+LOG.log(Level.FINE, "POM file {0} for module {1} does not
exist", new Object[] { modPom, modName });
+continue;
+}
+MavenProject child = MavenProjectCache.getMavenProject(modPom,
true, false);
+if (child == null) {
+continue;
+}
+// the project may have more problems, more subtle, but now repair
just total breakage
+if (!MavenProjectCache.isFallbackproject(child)) {
+LOG.log(Level.FINE, "Project for module {0} is not a fallback,
skipping", modName);
+}
+FileObject dir = FileUtil.toFileObject(modPom.getParentFile());
+if (dir == null) {
+LOG.log(Level.FINE, "Project directory for {0} is not a
FileObject", modName);
+continue;
+}
+try {
+Project c = ProjectManager.getDefault().findProject(dir);
+if (c == null) {
+LOG.log(Level.FINE, "Module {0} is not a project",
modName);
+} else {
+LOG.log(Level.INFO, "Recovering module {0}, pomfile {1}",
new Object[] { modName, modPom });
+NbMavenProjectImpl childImpl =
c.getLookup().lookup(NbMavenProjectImpl.class);
+childImpl.fireProjectReload();
+
[netbeans] branch master updated (48220602d0 -> e761e5edfb)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 48220602d0 VSNetBeans changelog update for 17.0.301 (#5782) new ee3a0f65ec Try to match versionless direct children to resolved dependencies. new 08fe36fc58 If no origin is reported, pretend this configuration defines the dependency to prevent NPEs later. new e761e5edfb Merge pull request #5773 from sdedic/gradle/versionless-dependency The 8425 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: .../modules/gradle/api/GradleBaseProjectBuilder.java | 15 ++- .../java/queries/GradleDependenciesImplementation.java| 4 2 files changed, 18 insertions(+), 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] branch vsnetbeans_1703 updated: VSNetBeans changelog update for 17.0.301 (#5782)
This is an automated email from the ASF dual-hosted git repository. dbalek pushed a commit to branch vsnetbeans_1703 in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/vsnetbeans_1703 by this push: new fd55937d5d VSNetBeans changelog update for 17.0.301 (#5782) fd55937d5d is described below commit fd55937d5d1f804a73a3d5c01dd2d27b7e8cc29d Author: Dusan Balek AuthorDate: Thu Apr 6 11:51:44 2023 +0200 VSNetBeans changelog update for 17.0.301 (#5782) --- java/java.lsp.server/vscode/CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/java/java.lsp.server/vscode/CHANGELOG.md b/java/java.lsp.server/vscode/CHANGELOG.md index 2d482521b9..7ec3af9fc9 100644 --- a/java/java.lsp.server/vscode/CHANGELOG.md +++ b/java/java.lsp.server/vscode/CHANGELOG.md @@ -20,6 +20,11 @@ under the License. --> +## Version 17.0.301 +* nb-javac 20 support +* Gradle support to work on JDK 20 +* Various bug fixes + ## Version 17.0.0 * Various bug fixes - 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: VSNetBeans changelog update for 17.0.301 (#5782)
This is an automated email from the ASF dual-hosted git repository. dbalek 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 48220602d0 VSNetBeans changelog update for 17.0.301 (#5782) 48220602d0 is described below commit 48220602d06155f60d44b42a0c41ac0a1afd7abc Author: Dusan Balek AuthorDate: Thu Apr 6 11:51:44 2023 +0200 VSNetBeans changelog update for 17.0.301 (#5782) --- java/java.lsp.server/vscode/CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/java/java.lsp.server/vscode/CHANGELOG.md b/java/java.lsp.server/vscode/CHANGELOG.md index 2d482521b9..7ec3af9fc9 100644 --- a/java/java.lsp.server/vscode/CHANGELOG.md +++ b/java/java.lsp.server/vscode/CHANGELOG.md @@ -20,6 +20,11 @@ under the License. --> +## Version 17.0.301 +* nb-javac 20 support +* Gradle support to work on JDK 20 +* Various bug fixes + ## Version 17.0.0 * Various bug fixes - 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-jenkins-lib] branch master updated: scan also for vsnetbeans_x branches
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-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 4f7830d scan also for vsnetbeans_x branches
4f7830d is described below
commit 4f7830da3588fd76c69c478dc463c2e76d4d5f16
Author: Eric Barboni
AuthorDate: Thu Apr 6 11:32:47 2023 +0200
scan also for vsnetbeans_x branches
---
vars/asfMainNetBeansBuild.groovy | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index b23d2bd..bf80ddc 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -92,9 +92,13 @@ def call(Map params = [:]) {
if (!releaseInformation[branch]) {
// no branch definined in json exit build
if
(releaseInformation[branch.replace('vsnetbeans_preview_','release')]) {
-// branch is release1234
+// branch is release1234 for
vsnetbeans_preview_1237
branch =
branch.replace('vsnetbeans_preview_','release')
-} else {
+} else if
(releaseInformation[branch.replace('vsnetbeans_','release')]) {
+// branch is release1234 for vsnetbeans_1237
+branch =
branch.replace('vsnetbeans_','release')
+}
+else {
// no branch definined in json exit build
currentBuild.result = "FAILURE"
throw new Exception("No entry in json for
$branch")
-
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-jenkins-lib] branch master updated: branch for vscode change
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-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 56c900f branch for vscode change
56c900f is described below
commit 56c900fe100620a17c21a277c3e2593a13dd59ff
Author: Eric Barboni
AuthorDate: Thu Apr 6 10:59:16 2023 +0200
branch for vscode change
---
jobs/netbeansreleasetlp.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jobs/netbeansreleasetlp.groovy b/jobs/netbeansreleasetlp.groovy
index 77a1242..b5dd545 100755
--- a/jobs/netbeansreleasetlp.groovy
+++ b/jobs/netbeansreleasetlp.groovy
@@ -36,7 +36,7 @@ organizationFolder('NetBeans/netbeans-TLP') {
}
traits << 'jenkins.plugins.git.traits.BranchDiscoveryTrait' {}
traits << 'jenkins.scm.impl.trait.RegexSCMHeadFilterTrait' {
-regex('(master|release\\d+$|vsnetbeans_preview_\\d+$)')
+
regex('(master|release\\d+$|vsnetbeans_preview_\\d+$|vsnetbeans_\\d+$)')
}
}
-
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-jenkins-lib] branch master updated: allow another jdk for apidoc
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-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 3cbc908 allow another jdk for apidoc
new fb470a7 Merge pull request #85 from ebarboni/apidocmaster
3cbc908 is described below
commit 3cbc9088d0338ee6e37586d49840ac988e3ee249
Author: Eric Barboni
AuthorDate: Wed Apr 5 17:09:48 2023 +0200
allow another jdk for apidoc
---
meta/netbeansrelease.json| 1 +
vars/asfMainNetBeansBuild.groovy | 10 ++
2 files changed, 11 insertions(+)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index a7885e0..f90b46a 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -968,6 +968,7 @@
"position": "5",
"ant": "ant_latest",
"jdk": "jdk_11_latest",
+"jdktoolapidoc" : "jdk_19_latest",
"jdk_apidoc": "https://docs.oracle.com/en/java/javase/11/docs/api/;,
"maven": "maven_3_latest",
"mavenversion": "dev-SNAPSHOT",
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index 6c979a5..b23d2bd 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -123,6 +123,11 @@ def call(Map params = [:]) {
//2018-07-29T12:00:00Z
atomdate =
releaseInformation[branch].releasedate['year']+'-'+releaseInformation[branch].releasedate['month']+'-'+releaseInformation[branch].releasedate['day']+'T12:00:00Z'
tooling.jdktool = releaseInformation[branch].jdk
+if (releaseInformation[branch].jdktoolapidoc) {
+tooling.jdktoolapidoc =
releaseInformation[branch].jdktoolapidoc
+}else {
+tooling.jdktoolapidoc =
releaseInformation[branch].jdk
+}
tooling.myMaven = releaseInformation[branch].maven
version = releaseInformation[branch].versionName;
vsixversion = releaseInformation[branch].vsixVersion;
@@ -163,6 +168,9 @@ def call(Map params = [:]) {
sh "ant getallmavencoordinates"
sh "ant build-nbms"
sh "ant build-source-zips"
+}
+withAnt(installation: tooling.myAnt, jdk:
tooling.jdktoolapidoc) {
+
sh "ant build-javadoc
-Djavadoc.web.zip=${env.WORKSPACE}/WEBZIP.zip"
junit
'nbbuild/build/javadoc/checklinks-errors.xml'
@@ -212,6 +220,8 @@ def call(Map params = [:]) {
steps {
withAnt(installation: tooling.myAnt) {
sh "ant"
+}
+withAnt(installation: tooling.myAnt, jdk:
tooling.jdktoolapidoc) {
sh "ant build-javadoc
-Djavadoc.web.zip=${env.WORKSPACE}/WEBZIP.zip"
}
junit 'nbbuild/build/javadoc/checklinks-errors.xml'
-
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: Report empty set if project does not use buildscript; prevent NPE.
This is an automated email from the ASF dual-hosted git repository.
sdedic 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 40b43f644c Report empty set if project does not use buildscript;
prevent NPE.
new d2031fea6d Merge pull request #5768 from
sdedic/gradle/dependency-no-buildscript
40b43f644c is described below
commit 40b43f644c77901534e72bcdcfb96054316c1a03
Author: Svata Dedic
AuthorDate: Mon Apr 3 09:37:36 2023 +0200
Report empty set if project does not use buildscript; prevent NPE.
---
.../modules/gradle/java/queries/GradleDependencyResult.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependencyResult.java
b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependencyResult.java
index eeeffd9152..11ab21d663 100644
---
a/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependencyResult.java
+++
b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependencyResult.java
@@ -230,7 +230,11 @@ public final class GradleDependencyResult implements
DependencyResult, PropertyC
@Override
public Collection getDependencyFiles() {
-FileObject fo =
FileUtil.toFileObject(gp.getGradleFiles().getBuildScript());
+File f = gp.getGradleFiles().getBuildScript();
+if (f == null) {
+return Collections.emptyList();
+}
+FileObject fo = FileUtil.toFileObject(f);
return fo == null ? Collections.emptyList() :
Collections.singletonList(fo);
}
-
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-jenkins-lib] branch master updated: Fix JSON error
This is an automated email from the ASF dual-hosted git repository.
mbalin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new e3e4c62 Fix JSON error
e3e4c62 is described below
commit e3e4c62d4a575561664d8fdb66c1a94d0327a85b
Author: Martin Balin
AuthorDate: Thu Apr 6 09:02:17 2023 +0200
Fix JSON error
---
meta/netbeansrelease.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index a42636c..f18401a 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -981,7 +981,8 @@
"b3cf9b988542578e8d2c55c4d090e5fb5797fa1e": {
"version": "rc1",
"position": "1"
-},
+}
+},
"releasedate": {
"day": "18",
"month": "04",
-
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-jenkins-lib] branch master updated: VSNetBeans 17.0.301 release
This is an automated email from the ASF dual-hosted git repository.
mbalin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new bafb5cd VSNetBeans 17.0.301 release
bafb5cd is described below
commit bafb5cd002d4a3ab777aa3be39de09d0a92b0bd3
Author: Martin Balin
AuthorDate: Thu Apr 6 08:48:37 2023 +0200
VSNetBeans 17.0.301 release
---
meta/netbeansrelease.json | 29 +
1 file changed, 29 insertions(+)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index a7885e0..a42636c 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -964,6 +964,35 @@
"year": "2022"
}
},
+"release1703": {
+"position": "26",
+"ant": "ant_latest",
+"jdk": "jdk_11_latest",
+"jdk_apidoc": "https://docs.oracle.com/en/java/javase/11/docs/api/;,
+"maven": "maven_3_latest",
+"versionName": "17.0.301",
+"vsixVersion": "17.0.301",
+"tlp": "true",
+"apidocurl": "https://bits.netbeans.org/17/javadoc;,
+"update_url":
"https://netbeans.apache.org/nb/updates/17/updates.xml.gz?{$netbeans.hash.code};,
+"plugin_url":
"https://netbeans.apache.org/nb/plugins/17/catalog.xml.gz;,
+"publish_apidoc":"false",
+"milestones": {
+"b3cf9b988542578e8d2c55c4d090e5fb5797fa1e": {
+"version": "rc1",
+"position": "1"
+},
+"releasedate": {
+"day": "18",
+"month": "04",
+"year": "2023"
+},
+"previousreleasedate": {
+"day": "-",
+"month": "-",
+"year": "-"
+}
+},
"master": {
"position": "5",
"ant": "ant_latest",
-
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
