[netbeans] branch master updated: [NETBEANS-4832] Avoid assertion & NPE in fxml code completion (#2399)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 794e55a [NETBEANS-4832] Avoid assertion & NPE in fxml code completion
(#2399)
794e55a is described below
commit 794e55ab43740e8d8186941635cb728e143d239a
Author: errael
AuthorDate: Wed Oct 7 21:25:47 2020 -0700
[NETBEANS-4832] Avoid assertion & NPE in fxml code completion (#2399)
* [NETBEANS-4832] Avoid assertion & NPE in fxml code completion
* Handle ANNOTATION_TYPE and ENUM in getTypeElementByBinaryName().
---
.../src/org/netbeans/modules/java/source/ElementUtils.java| 7 ++-
.../org/netbeans/modules/javafx2/editor/FXMLCompletion2.java | 11 +++
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/ElementUtils.java
b/java/java.source.base/src/org/netbeans/modules/java/source/ElementUtils.java
index 7aca70d..d411877 100644
---
a/java/java.source.base/src/org/netbeans/modules/java/source/ElementUtils.java
+++
b/java/java.source.base/src/org/netbeans/modules/java/source/ElementUtils.java
@@ -60,6 +60,11 @@ public class ElementUtils {
for (ModuleElement me : allModules) {
TypeElement found = getTypeElementByBinaryName(task, me, name);
+if (result == found) {
+// avoid returning null, partial fix for [NETBEANS-4832]
+continue;
+}
+
if (found != null) {
if ((ModuleSymbol) me == syms.unnamedModule) {
foundInUnamedModule = true;
@@ -67,7 +72,7 @@ public class ElementUtils {
if (result != null) {
if (foundInUnamedModule == true) {
for (TypeElement elem : new TypeElement[]{result,
found}) {
-if ((elem.getKind() == ElementKind.CLASS ||
elem.getKind() == ElementKind.INTERFACE)
+if ((elem.getKind().isClass() ||
elem.getKind().isInterface())
&& (((ClassSymbol) elem).packge().modle !=
syms.unnamedModule)) {
return elem;
}
diff --git
a/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/FXMLCompletion2.java
b/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/FXMLCompletion2.java
index 4931ed8..2e2c5c0 100644
---
a/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/FXMLCompletion2.java
+++
b/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/FXMLCompletion2.java
@@ -30,7 +30,8 @@ import javax.xml.parsers.SAXParserFactory;
import org.netbeans.api.editor.mimelookup.MimeLookup;
import org.netbeans.api.editor.mimelookup.MimeRegistration;
import org.netbeans.api.java.source.ClasspathInfo;
-import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.api.java.source.CompilationController;
+import org.netbeans.api.java.source.JavaSource.Phase;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.editor.BaseDocument;
import org.netbeans.modules.java.source.parsing.ClasspathInfoProvider;
@@ -131,7 +132,7 @@ public class FXMLCompletion2 implements CompletionProvider {
private int queryType;
private boolean fxmlParsing = true;
private CompletionContext ctx;
-private CompilationInfo ci;
+private CompilationController cc;
private FxmlParserResult fxmlResult;
public Task(ClasspathInfo cpInfo, JTextComponent component,
CompletionResultSet resultSet, Document doc, int caretOffset, int queryType) {
@@ -160,7 +161,9 @@ public class FXMLCompletion2 implements CompletionProvider {
return;
}
Parser.Result result = resultIterator.getParserResult();
-ci = CompilationInfo.get(result);
+// [NETBEANS-4832] CompController (not CompInfo) for module
info (partial fix)
+cc = CompilationController.get(result);
+cc.toPhase(Phase.ELEMENTS_RESOLVED);
ctx = new CompletionContext(doc, caretOffset, queryType);
@@ -171,7 +174,7 @@ public class FXMLCompletion2 implements CompletionProvider {
// bug in parsing API: snapshot source not modified just after
modification to the source file
try {
TokenHierarchy th = TokenHierarchy.get(doc);
-ctx.init(th, ci, fxmlResult);
+ctx.init(th, cc, fxmlResult);
} finally {
if (doc instanceof AbstractDocument) {
((AbstractDocument)doc).readUnlock();
-
To unsubscribe, e-mail:
[jira] [Updated] (NETBEANS-4883) Run/debug focused test method in Maven project regression in 12.1 from 12.0
[ https://issues.apache.org/jira/browse/NETBEANS-4883?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Qingtian Wang updated NETBEANS-4883: Description: In version 12.1, the run/debug focused test method feature took a step backward from 12.0 in a Maven project. In 12.0, the IDE automatically updates the project POM to be using higher version of Surefire as needed in this case. In 12.1, when the same version update is needed in the POM, the IDE shows a tiny error message on the lower left corner of the window, and fails. The same feature behavior in 12.0 should be brought back. was: In version 12.1, the run/debug focused test method took a stop backward from 12.0 in a Maven project. In 12.0, the IDE automatically update the project POM to be using higher version of Surefire as needed. In 12.1, when the same version update is needed, the IDE shows a tiny error message on the lower left corner of the window, and fails. > Run/debug focused test method in Maven project regression in 12.1 from 12.0 > --- > > Key: NETBEANS-4883 > URL: https://issues.apache.org/jira/browse/NETBEANS-4883 > Project: NetBeans > Issue Type: Test > Components: utilities - Test Runner >Affects Versions: 12.1 > Environment: Windows 10, JDK 14 >Reporter: Qingtian Wang >Priority: Major > Fix For: Next > > > In version 12.1, the run/debug focused test method feature took a step > backward from 12.0 in a Maven project. > > In 12.0, the IDE automatically updates the project POM to be using higher > version of Surefire as needed in this case. In 12.1, when the same version > update is needed in the POM, the IDE shows a tiny error message on the lower > left corner of the window, and fails. > > The same feature behavior in 12.0 should be brought back. -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[jira] [Created] (NETBEANS-4883) Run/debug focused test method in Maven project regression in 12.1 from 12.0
Qingtian Wang created NETBEANS-4883: --- Summary: Run/debug focused test method in Maven project regression in 12.1 from 12.0 Key: NETBEANS-4883 URL: https://issues.apache.org/jira/browse/NETBEANS-4883 Project: NetBeans Issue Type: Test Components: utilities - Test Runner Affects Versions: 12.1 Environment: Windows 10, JDK 14 Reporter: Qingtian Wang Fix For: Next In version 12.1, the run/debug focused test method took a stop backward from 12.0 in a Maven project. In 12.0, the IDE automatically update the project POM to be using higher version of Surefire as needed. In 12.1, when the same version update is needed, the IDE shows a tiny error message on the lower left corner of the window, and fails. -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[jira] [Updated] (NETBEANS-4875) Netbeans hanged
[
https://issues.apache.org/jira/browse/NETBEANS-4875?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Laszlo Kishalmi updated NETBEANS-4875:
--
Component/s: php - Editor
> Netbeans hanged
> ---
>
> Key: NETBEANS-4875
> URL: https://issues.apache.org/jira/browse/NETBEANS-4875
> Project: NetBeans
> Issue Type: Bug
> Components: ide - UI, php - Editor
>Affects Versions: 12.0
> Environment: Ubuntu Linux 18.04.5
>Reporter: Òscar Pérez
>Priority: Minor
>
> I opened a PHP project build with Laravel. This project has 11832 files.
> Netbeans completelly freezed and consumed about an 80% of my CPU for several
> minutes until I killed it.
> After restarting, a window with this UI log appeared:
>
> 2020-10-06T08:52:02
> 1601967122316
> 2106
> org.netbeans.modules.deadlock.detector.Detector
> 1000
> 40
> /tmp/deadlock6539821727693538142.txt
>
>
> org.netbeans.modules.deadlock.detector.Detector$DeadlockDetectedException:
> A deadlock was detected.
> We suggest to restart the IDE to recover.
>
>
> org.netbeans.modules.editor.mimelookup.impl.FolderPathLookup$InstanceItem
> getRef
> 277
>
> ${netbeans.home}modules/org-netbeans-modules-editor-mimelookup-impl.jar
>
>
>
> org.netbeans.modules.editor.mimelookup.impl.FolderPathLookup$InstanceItem
> instanceOf
> 285
>
> ${netbeans.home}modules/org-netbeans-modules-editor-mimelookup-impl.jar
>
>
>
> org.netbeans.modules.editor.mimelookup.impl.FolderPathLookup$PairItem
> instanceOf
> 169
>
> ${netbeans.home}modules/org-netbeans-modules-editor-mimelookup-impl.jar
>
>
> org.openide.util.lookup.InheritanceTree
> searchInterface
> 858
> ${netbeans.home}lib/org-openide-util-lookup.jar
>
>
> org.openide.util.lookup.InheritanceTree
> lookup
> 215
> ${netbeans.home}lib/org-openide-util-lookup.jar
>
>
> org.openide.util.lookup.InheritanceTree
> registerReferenceToResult
> 984
> ${netbeans.home}lib/org-openide-util-lookup.jar
>
>
> org.openide.util.lookup.DelegatingStorage
> registerReferenceToResult
> 155
> ${netbeans.home}lib/org-openide-util-lookup.jar
>
>
> org.openide.util.lookup.AbstractLookup
> lookup
> 472
> ${netbeans.home}lib/org-openide-util-lookup.jar
>
>
> org.netbeans.modules.editor.mimelookup.impl.SwitchLookup
> lookup
> 60
>
> ${netbeans.home}modules/org-netbeans-modules-editor-mimelookup-impl.jar
>
>
> org.openide.util.lookup.ProxyLookup$R
> lookupChange
> 435
> ${netbeans.home}lib/org-openide-util-lookup.jar
>
>
> org.openide.util.lookup.ProxyLookup
> setData
> 288
> ${netbeans.home}lib/org-openide-util-lookup.jar
>
>
> org.openide.util.lookup.ProxyLookup
> setLookups
> 127
> ${netbeans.home}lib/org-openide-util-lookup.jar
>
>
> org.netbeans.modules.editor.mimelookup.MimePathLookup
> rebuild
> 157
>
> ${netbeans.home}modules/org-netbeans-modules-editor-mimelookup.jar
>
>
> org.netbeans.modules.editor.mimelookup.MimePathLookup
> beforeLookup
> 88
>
> ${netbeans.home}modules/org-netbeans-modules-editor-mimelookup.jar
>
>
> org.openide.util.lookup.ProxyLookup
> lookup
> 189
> ${netbeans.home}lib/org-openide-util-lookup.jar
>
>
> org.netbeans.modules.lexer.nbbridge.MimeLookupLanguageProvider
> findLanguageEmbedding
> 87
> ${netBeansDir}modules/org-netbeans-modules-lexer-nbbridge.jar
>
>
> org.netbeans.lib.lexer.LanguageManager
> findLanguageEmbedding
> 151
> ${netBeansDir}modules/org-netbeans-modules-lexer.jar
>
>
> org.netbeans.lib.lexer.LexerUtilsConstants
> findEmbedding
> 172
> ${netBeansDir}modules/org-netbeans-modules-lexer.jar
>
>
> org.netbeans.lib.lexer.EmbeddingOperation
> embeddedTokenList
> 133
> ${netBeansDir}modules/org-netbeans-modules-lexer.jar
>
>
> org.netbeans.api.lexer.TokenSequence
> embeddedImpl
> 348
> ${netBeansDir}modules/org-netbeans-modules-lexer.jar
>
>
> org.netbeans.api.lexer.TokenSequence
> embedded
> 295
> ${netBeansDir}modules/org-netbeans-modules-lexer.jar
>
>
> org.netbeans.lib.lexer.TokenHierarchyOperation
> embeddedTokenSequences
> 454
> ${netBeansDir}modules/org-netbeans-modules-lexer.jar
>
>
> org.netbeans.api.lexer.TokenHierarchy
> embeddedTokenSequences
> 240
> ${netBeansDir}modules/org-netbeans-modules-lexer.jar
>
>
> org.netbeans.modules.editor.bracesmatching.MasterMatcher$2
> run
> 507
>
> ${netBeansDir}modules/org-netbeans-modules-editor-bracesmatching.jar
>
>
> org.netbeans.editor.BaseDocument
> render
> 1402
> ${netBeansDir}modules/org-netbeans-modules-editor-lib.jar
>
>
> org.netbeans.modules.editor.bracesmatching.MasterMatcher
> findFactories
> 503
>
> ${netBeansDir}modules/org-netbeans-modules-editor-bracesmatching.jar
>
>
> org.netbeans.modules.editor.bracesmatching.MasterMatcher
> access$1600
> 60
>
>
[jira] [Created] (NETBEANS-4882) Output from Find Usages not being displayed correctly
Owen created NETBEANS-4882:
--
Summary: Output from Find Usages not being displayed correctly
Key: NETBEANS-4882
URL: https://issues.apache.org/jira/browse/NETBEANS-4882
Project: NetBeans
Issue Type: Bug
Affects Versions: 12.0
Reporter: Owen
Attachments: Actual.png, Apparent.png
The output from the Find Usages function in NB 12 of a constructor that
includes the quotation of generic parameters seems to leave out the left angle
brace as well as other detail. When I run this in NB 11 from a command prompt,
I notice what is given in the "apparent" screenshot appear in my terminal
window. The "actual" code also appears
as a screenshot.
I thought someone may find this to be an interesting clue as to what goes wrong
with the Find Usages feature I have earlier commented about. My cursory
diagnosis is that something in NB is trying to parse my generics as XML/HTML.
Terminal window output appears below:
WARNING [org.openide.awt.HtmlRenderer]: Malformed or unsupported HTML
WARNING [org.openide.awt.HtmlRenderer]: 60: this.ownerConnection=new
Locker,S,C_I,C_G,C_N,I>(s.getQualeContainer()){
WARNING [org.openide.awt.HtmlRenderer]:
^
WARNING [org.openide.awt.HtmlRenderer]: Full HTML string:60: this.ownerConnection=new
Locker,S,C_I,C_G,C_N,I>(s.getQualeContainer()){
WARNING [org.openide.awt.HtmlRenderer]: Could not find color identifier in font
declaration
WARNING [org.openide.awt.HtmlRenderer]: 172: return new
Locker,FeatureMessage,FeatureMessageResonance,
WARNING [org.openide.awt.HtmlRenderer]: S,C_I,C_G,C_N,I>(this){
WARNING [org.openide.awt.HtmlRenderer]:
^
WARNING [org.openide.awt.HtmlRenderer]: Full HTML string: 172: return new
Locker,FeatureMessage,FeatureMessageResonance,
WARNING [org.openide.awt.HtmlRenderer]: S,C_I,C_G,C_N,I>(this){
WARNING [org.openide.awt.HtmlRenderer]: Illegal hexadecimal color text: Featur
in HTML string
WARNING [org.openide.awt.HtmlRenderer]: 172: return new
Locker,FeatureMessage,FeatureMessageResonance,
WARNING [org.openide.awt.HtmlRenderer]: S,C_I,C_G,C_N,I>(this){
WARNING [org.openide.awt.HtmlRenderer]:
^
WARNING [org.openide.awt.HtmlRenderer]: Full HTML string: 172: return new
Locker,FeatureMessage,FeatureMessageResonance,
WARNING [org.openide.awt.HtmlRenderer]: S,C_I,C_G,C_N,I>(this){
WARNING [org.openide.awt.HtmlRenderer]: Unresolvable html color: Featur in HTML
string
WARNING [org.openide.awt.HtmlRenderer]:
WARNING [org.openide.awt.HtmlRenderer]: 172: return new
Locker,FeatureMessage,FeatureMessageResonance,
WARNING [org.openide.awt.HtmlRenderer]: S,C_I,C_G,C_N,I>(this){
WARNING [org.openide.awt.HtmlRenderer]:
^
WARNING [org.openide.awt.HtmlRenderer]: Full HTML string: 172: return new
Locker,FeatureMessage,FeatureMessageResonance,
WARNING [org.openide.awt.HtmlRenderer]: S,C_I,C_G,C_N,I>(this){
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
-
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: [NETBEANS-4819] Applied Emilian Bold's patch that fixes missing time-stamp authority for nbm signing patch found at https://bugzilla-attachments-243213.netbeans.org/b
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 8109ad9 [NETBEANS-4819] Applied Emilian Bold's patch that fixes
missing time-stamp authority for nbm signing patch found at
https://bugzilla-attachments-243213.netbeans.org/bugzilla/attachment.cgi?id=161749
new 0e88bed Merge pull request #2413 from SirIntellegence/NETBEANS-4819
8109ad9 is described below
commit 8109ad9c434363732198597d7d498f8a19a92dab
Author: Austin Stephens
AuthorDate: Thu Oct 1 14:42:23 2020 -0600
[NETBEANS-4819] Applied Emilian Bold's patch that fixes missing time-stamp
authority for nbm signing
patch found at
https://bugzilla-attachments-243213.netbeans.org/bugzilla/attachment.cgi?id=161749
---
nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java | 15 +++
nbbuild/templates/common.xml | 4 +++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java
b/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java
index f8524e3..018157f 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java
@@ -264,6 +264,7 @@ public class MakeNBM extends Task {
public /*static*/ class Signature {
public File keystore;
public String storepass, alias;
+public String tsaurl, tsacert;
/** Path to the keystore (private key). */
public void setKeystore(File f) {
keystore = f;
@@ -279,6 +280,14 @@ public class MakeNBM extends Task {
public void setAlias(String s) {
alias = s;
}
+ /** Time Stamping Authority (TSA) URL */
+ public void setTsaurl(String s) {
+ tsaurl = s;
+ }
+ /** Alias for the TSA's public key certificate */
+ public void setTsacert(String s) {
+ tsacert = s;
+ }
}
private File productDir = null;
@@ -843,6 +852,12 @@ public class MakeNBM extends Task {
} catch (Exception x) {
throw new BuildException(x);
}
+if(signature.tsaurl != null && !signature.tsaurl.isEmpty()) {
+signjar.setTsaurl(signature.tsaurl);
+}
+if(signature.tsacert != null && !signature.tsacert.isEmpty()) {
+signjar.setTsacert(signature.tsacert);
+}
signjar.setStorepass (signature.storepass);
signjar.setAlias (signature.alias);
signjar.setLocation(getLocation());
diff --git a/nbbuild/templates/common.xml b/nbbuild/templates/common.xml
index 5533eff..22b6738 100644
--- a/nbbuild/templates/common.xml
+++ b/nbbuild/templates/common.xml
@@ -82,6 +82,8 @@
+
+
@@ -467,7 +469,7 @@
locales="${nbm.locales}"
>
-
+
-
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
[jira] [Commented] (NETBEANS-4540) SyntaxException for specific grammar
[
https://issues.apache.org/jira/browse/NETBEANS-4540?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17209801#comment-17209801
]
Jakub Herkel commented on NETBEANS-4540:
I tried to update org.eclipse.tm4e.core to version 0.4.1.202006041920 and I
didn't see any exceptions. But I don't know how to prepare patch because it
seems that it needs to upload a file to [https://netbeans.osuosl.org/binaries/]
but I didn't find any instruction how to do it if I am not PMC member.
> SyntaxException for specific grammar
>
>
> Key: NETBEANS-4540
> URL: https://issues.apache.org/jira/browse/NETBEANS-4540
> Project: NetBeans
> Issue Type: Bug
> Components: textmate-lexer
>Affects Versions: 12.0
> Environment: Product Version: Apache NetBeans IDE 12.0
> Java: 11.0.2; Java HotSpot(TM) 64-Bit Server VM 11.0.2+9-LTS
> Runtime: Java(TM) SE Runtime Environment 11.0.2+9-LTS
> System: Windows 10 version 10.0 running on amd64; Cp1252; de_DE (nb)
> User directory: C:\Users\Chris\AppData\Roaming\Netbeans\12.0
> Cache directory: C:\Users\Chris\AppData\Local\NetBeans\Cache\12.0
>Reporter: Christian Lenz
>Assignee: Jan Lahoda
>Priority: Major
> Attachments: example.jl, example.tex
>
>
> When I use this grammar file:
> https://github.com/James-Yu/LaTeX-Workshop/blob/master/syntax/LaTeX.tmLanguage.json
> for tex files, I got an SyntaxException fot the attached file (example.tex)
> {code}
> org.joni.exception.SyntaxException: premature end of char-class
> at org.joni.ScannerSupport.newSyntaxException(ScannerSupport.java:166)
> at org.joni.Parser.parseCharClass(Parser.java:342)
> at org.joni.Parser.parseCharClass(Parser.java:318)
> at org.joni.Parser.parseExp(Parser.java:892)
> at org.joni.Parser.parseBranch(Parser.java:1116)
> at org.joni.Parser.parseSubExp(Parser.java:1133)
> at org.joni.Parser.parseRegexp(Parser.java:1166)
> at org.joni.Parser.parse(Parser.java:65)
> at org.joni.Analyser.compile(Analyser.java:80)
> at org.joni.Regex.(Regex.java:159)
> at org.joni.Regex.(Regex.java:136)
> at
> org.eclipse.tm4e.core.internal.oniguruma.OnigRegExp.(OnigRegExp.java:49)
> at
> org.eclipse.tm4e.core.internal.oniguruma.OnigSearcher.(OnigSearcher.java:29)
> at
> org.eclipse.tm4e.core.internal.oniguruma.OnigScanner.(OnigScanner.java:24)
> at
> org.eclipse.tm4e.core.internal.rule.RegExpSourceList.createOnigScanner(RegExpSourceList.java:132)
> at
> org.eclipse.tm4e.core.internal.rule.RegExpSourceList.compile(RegExpSourceList.java:86)
> at
> org.eclipse.tm4e.core.internal.rule.BeginEndRule.compile(BeginEndRule.java:77)
> at
> org.eclipse.tm4e.core.internal.grammar.LineTokenizer.matchRule(LineTokenizer.java:276)
> at
> org.eclipse.tm4e.core.internal.grammar.LineTokenizer.matchRuleOrInjections(LineTokenizer.java:299)
> at
> org.eclipse.tm4e.core.internal.grammar.LineTokenizer.scanNext(LineTokenizer.java:110)
> at
> org.eclipse.tm4e.core.internal.grammar.LineTokenizer.scan(LineTokenizer.java:97)
> at
> org.eclipse.tm4e.core.internal.grammar.LineTokenizer._tokenizeString(LineTokenizer.java:537)
> at
> org.eclipse.tm4e.core.internal.grammar.Grammar._tokenize(Grammar.java:239)
> at
> org.eclipse.tm4e.core.internal.grammar.Grammar.tokenizeLine(Grammar.java:191)
> at
> org.netbeans.modules.textmate.lexer.TextmateLexer.nextToken(TextmateLexer.java:75)
> at
> org.netbeans.lib.lexer.LexerInputOperation.nextToken(LexerInputOperation.java:191)
> at
> org.netbeans.lib.lexer.inc.IncTokenList.tokenOrEmbeddingImpl(IncTokenList.java:170)
> at
> org.netbeans.lib.lexer.inc.IncTokenList.tokenOrEmbedding(IncTokenList.java:165)
> at org.netbeans.api.lexer.TokenSequence.moveNext(TokenSequence.java:463)
> at
> org.netbeans.modules.textmate.lexer.SyntaxHighlighting$TSInfo.moveNextToken(SyntaxHighlighting.java:779)
> at
> org.netbeans.modules.textmate.lexer.SyntaxHighlighting$HSImpl.moveTheSequence(SyntaxHighlighting.java:476)
> at
> org.netbeans.modules.textmate.lexer.SyntaxHighlighting$HSImpl.moveNext(SyntaxHighlighting.java:405)
> at
> org.netbeans.modules.editor.lib2.highlighting.DirectMergeContainer$Wrapper.fetchNextHighlight(DirectMergeContainer.java:600)
> at
> org.netbeans.modules.editor.lib2.highlighting.DirectMergeContainer$HlSequence.updateMergeVars(DirectMergeContainer.java:337)
> at
> org.netbeans.modules.editor.lib2.highlighting.DirectMergeContainer$HlSequence.nextMerge(DirectMergeContainer.java:303)
> at
> org.netbeans.modules.editor.lib2.highlighting.DirectMergeContainer$HlSequence.moveNext(DirectMergeContainer.java:234)
> at
>
[jira] [Resolved] (NETBEANS-4848) Annotation processing in Gradle 4.10 vs. 6.x versions
[
https://issues.apache.org/jira/browse/NETBEANS-4848?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Laszlo Kishalmi resolved NETBEANS-4848.
---
Fix Version/s: 12.2
Resolution: Fixed
Supposed to be fixed as the PR got integrated.
> Annotation processing in Gradle 4.10 vs. 6.x versions
> -
>
> Key: NETBEANS-4848
> URL: https://issues.apache.org/jira/browse/NETBEANS-4848
> Project: NetBeans
> Issue Type: Bug
> Components: projects - Gradle
>Affects Versions: 12.0, 12.1
>Reporter: Jaroslav Tulach
>Assignee: Laszlo Kishalmi
>Priority: Major
> Labels: pull-request-available
> Fix For: 12.2
>
> Time Spent: 20m
> Remaining Estimate: 0h
>
> A description of a problem shall not start with finding the root cause, but
> be it: It never stops surprising me how incompatible Gradle is. I have
> written some {{build.gradle}} scripts for some version of Gradle, but then
> after few new releases, those scripts don't work at all. The fix is simple:
> include `gradlew` in your repository and fix Gradle version, but this is
> so(!) different compared to Maven! Let me explain the problem:
> * Follow [the
> steps|https://github.com/JaroslavTulach/oraclejet4j/blob/master/README.md]
> and get the repository, commit
> [eee35b7|https://github.com/JaroslavTulach/oraclejet4j/commit/eee35b737795ef03c45028c0809b388aa8552367]
> * Usage from command line works, but:
> * Open the project in NetBeans. There are errors in {{RootViewModel}} class
> My IDE cannot find {{RootViewModelBase}}, {{NavItemBase}},
> {{FooterLinkBase}}. Those classes are generated by annotation processor
> (\{{"com.dukescript.api:javafx.beaninfo:0.6"}}). A normal behavior of
> {{javac}} is to locate all annotation processors on "compile" class path and
> use them. Gradle 4.10 does that. New versions of Gradle don't do that().
>
> I assume NetBeans 12.x is using new version of Gradle internally and as such,
> it doesn't find the annotation processor. As such the code is rendered as
> broken. Can we fix that somehow (without rewriting the project to Maven ;))?
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
-
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
[jira] [Resolved] (NETBEANS-4867) Gradle SubProject loading is inconsistent
[ https://issues.apache.org/jira/browse/NETBEANS-4867?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Laszlo Kishalmi resolved NETBEANS-4867. --- Fix Version/s: 12.2 Resolution: Fixed > Gradle SubProject loading is inconsistent > - > > Key: NETBEANS-4867 > URL: https://issues.apache.org/jira/browse/NETBEANS-4867 > Project: NetBeans > Issue Type: Bug > Components: projects - Gradle >Reporter: Laszlo Kishalmi >Assignee: Laszlo Kishalmi >Priority: Major > Labels: pull-request-available > Fix For: 12.2 > > Time Spent: 20m > Remaining Estimate: 0h > > It is not always detected whether a folder is a Sub project of a Gradle > multi-project build. Even when the full project information is available, > reloading the project does not work, even if the project information is > cached. -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[jira] [Updated] (NETBEANS-2644) NB11 gradle plugin can't open buildSrc subproject
[ https://issues.apache.org/jira/browse/NETBEANS-2644?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] ASF GitHub Bot updated NETBEANS-2644: - Labels: pull-request-available (was: ) > NB11 gradle plugin can't open buildSrc subproject > - > > Key: NETBEANS-2644 > URL: https://issues.apache.org/jira/browse/NETBEANS-2644 > Project: NetBeans > Issue Type: Bug > Components: projects - Gradle >Affects Versions: 11.0 >Reporter: Shevek >Assignee: Laszlo Kishalmi >Priority: Major > Labels: pull-request-available > Time Spent: 10m > Remaining Estimate: 0h > > Can't find a way to open the buildSrc/ "special" subproject in netbeans 11. > Gone back to netbeans 10 to edit it. > Could be related to the project not building - but I need to edit buildSrc to > fix the build? -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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: [NETBEANS-4867] Fix inconsistent Gradle SubProject Detection (#2411)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 c43ee9b [NETBEANS-4867] Fix inconsistent Gradle SubProject Detection
(#2411)
c43ee9b is described below
commit c43ee9b5091e16ccd0adfeeb50ebaa0e45be0799
Author: Laszlo Kishalmi
AuthorDate: Wed Oct 7 09:47:33 2020 -0700
[NETBEANS-4867] Fix inconsistent Gradle SubProject Detection (#2411)
* Extract disk cache implementation from GradleProjectCache
* [NETBEANS-4867] Use a distinct disk cache for Gradle subprojects
---
.../modules/gradle/GradleProjectCache.java | 158 +++--
.../modules/gradle/NbGradleProjectFactory.java | 8 +-
.../gradle/api/GradleBaseProjectBuilder.java | 7 +-
.../modules/gradle/cache/AbstractDiskCache.java| 156
.../modules/gradle/cache/ProjectInfoDiskCache.java | 119
.../modules/gradle/cache/SubProjectDiskCache.java | 134 +
.../modules/gradle/nodes/SubProjectsNode.java | 20 +--
.../gradle/nodes/SubProjectsNodeFactory.java | 16 +--
8 files changed, 452 insertions(+), 166 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/GradleProjectCache.java
b/extide/gradle/src/org/netbeans/modules/gradle/GradleProjectCache.java
index 0453456..f0f69ee 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/GradleProjectCache.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/GradleProjectCache.java
@@ -18,6 +18,8 @@
*/
package org.netbeans.modules.gradle;
+import org.netbeans.modules.gradle.cache.ProjectInfoDiskCache;
+import org.netbeans.modules.gradle.cache.SubProjectDiskCache;
import org.netbeans.modules.gradle.spi.GradleFiles;
import org.netbeans.modules.gradle.api.GradleBaseProject;
import org.netbeans.modules.gradle.api.NbGradleProject.Quality;
@@ -26,17 +28,10 @@ import org.netbeans.modules.gradle.api.NbProjectInfo;
import org.netbeans.modules.gradle.spi.GradleSettings;
import org.netbeans.modules.gradle.spi.ProjectInfoExtractor;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@@ -67,8 +62,9 @@ import static org.netbeans.modules.gradle.GradleDaemon.*;
import org.netbeans.modules.gradle.api.NbGradleProject;
import org.netbeans.modules.gradle.api.execute.GradleCommandLine;
import java.util.WeakHashMap;
-import java.util.concurrent.ConcurrentHashMap;
import javax.swing.JLabel;
+import org.netbeans.modules.gradle.cache.AbstractDiskCache.CacheEntry;
+import
org.netbeans.modules.gradle.cache.ProjectInfoDiskCache.QualifiedProjectInfo;
import org.netbeans.modules.gradle.api.execute.RunUtils;
import org.openide.awt.Notification;
import org.openide.awt.NotificationDisplayer;
@@ -86,18 +82,12 @@ public final class GradleProjectCache {
private enum GoOnline { NEVER, ON_DEMAND, ALWAYS }
private static final Logger LOG =
Logger.getLogger(GradleProjectCache.class.getName());
-private static final String INFO_CACHE_FILE_NAME = "project-info.ser";
//NOI18N
private static final Map> NOTIFICATIONS = new
WeakHashMap<>();
private static AtomicLong timeInLoad = new AtomicLong();
private static AtomicInteger loadedProjects = new AtomicInteger();
-private static final Map> SUB_PROJECT_DIR_CACHE = new
ConcurrentHashMap<>();
-
-// Increase this number if new info is gathered from the projects.
-private static final int COMPATIBLE_CACHE_VERSION = 15;
-
private GradleProjectCache() {
}
@@ -121,12 +111,11 @@ public final class GradleProjectCache {
GradleProject prev = project.project != null ? project.project :
fallbackProject(files);
// Try to turn to the cache
-if (!(ignoreCache || GradleSettings.getDefault().isCacheDisabled())
-&& (prev.getQuality() == FALLBACK)) {
-ProjectCacheEntry cacheEntry = loadCachedProject(files);
+if (!ignoreCache && (prev.getQuality() == FALLBACK)) {
+CacheEntry cacheEntry = new
ProjectInfoDiskCache(files).loadEntry();
if (cacheEntry != null) {
if (cacheEntry.isCompatible()) {
-prev = createGradleProject(cacheEntry.quality,
cacheEntry.data);
+prev = createGradleProject(cacheEntry.getData());
if (cacheEntry.isValid()) {
updateSubDirectoryCache(prev);
return prev;
@@ -242,12
[netbeans] branch master updated: Check Javadoc build
This is an automated email from the ASF dual-hosted git repository.
hectorespert 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 c69484f Check Javadoc build
new 6d4d683 Merge pull request #2415 from hectorespert/ci_build_doc
c69484f is described below
commit c69484fe6e1eaef7ac05d09b9441096ddde66644
Author: Hector Espert
AuthorDate: Fri Oct 2 18:02:37 2020 +0200
Check Javadoc build
---
.github/workflows/main.yml | 28
1 file changed, 28 insertions(+)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 55319db..16dfb78 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -104,6 +104,34 @@ jobs:
- name: Test Netbeans Build System
run: ant -Dcluster.config=basic localtest
+
+ linux-javadoc:
+name: Check Javadoc build
+runs-on: ubuntu-18.04
+env:
+ ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
+steps:
+ - name: Checkout
+uses: actions/checkout@v2
+
+ - name: Caching dependencies
+uses: actions/cache@v2
+with:
+ path: ~/.hgexternalcache
+ key: ${{ runner.os }}-${{ hashFiles('**/external/binaries-list') }}
+ restore-keys: ${{ runner.os }}-
+
+ - name: Get maven coordinates
+run: ant getallmavencoordinates
+
+ - name: Build nbms
+run: ant build-nbms
+
+ - name: Build source zips
+run: ant build-source-zips
+
+ - name: Build javadoc
+run: ant build-javadoc
linux-php:
name: Linux build of PHP cluster
-
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
[jira] [Created] (NETBEANS-4881) Automatically detect & list Payara Server version from Apache NetBeans IDE
Gaurav Gupta created NETBEANS-4881: -- Summary: Automatically detect & list Payara Server version from Apache NetBeans IDE Key: NETBEANS-4881 URL: https://issues.apache.org/jira/browse/NETBEANS-4881 Project: NetBeans Issue Type: New Feature Components: serverplugins - Code Affects Versions: 12.1 Reporter: Gaurav Gupta Currently, Payara Server versions are manually updated after each release of the Payara Server in Apache NetBeans Payara tools, with this feature a regular version upgrade of the Payara Server will not be required as Payara Server is now released on a monthly timeframe and Apache NetBeans on the quarterly timeframe, list of Payara Platform version will be fetched from [https://repo1.maven.org/maven2/fish/payara/distributions/payara/maven-metadata.xml]. Metadata XML only contains the list of Payara Server Community artifact versions which will be listed (except Beta and Alpha version) in the download combo-box during the registration of the Payara Server in the Apache NetBeans. -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[jira] [Assigned] (NETBEANS-4881) Automatically detect & list Payara Server version from Apache NetBeans IDE
[ https://issues.apache.org/jira/browse/NETBEANS-4881?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Gaurav Gupta reassigned NETBEANS-4881: -- Assignee: Gaurav Gupta > Automatically detect & list Payara Server version from Apache NetBeans IDE > -- > > Key: NETBEANS-4881 > URL: https://issues.apache.org/jira/browse/NETBEANS-4881 > Project: NetBeans > Issue Type: New Feature > Components: serverplugins - Code >Affects Versions: 12.1 >Reporter: Gaurav Gupta >Assignee: Gaurav Gupta >Priority: Major > > Currently, Payara Server versions are manually updated after each release of > the Payara Server in Apache NetBeans Payara tools, with this feature a > regular version upgrade of the Payara Server will not be required as Payara > Server is now released on a monthly timeframe and Apache NetBeans on the > quarterly timeframe, list of Payara Platform version will be fetched from > [https://repo1.maven.org/maven2/fish/payara/distributions/payara/maven-metadata.xml]. > Metadata XML only contains the list of Payara Server Community artifact > versions which will be listed (except Beta and Alpha version) in the download > combo-box during the registration of the Payara Server in the Apache NetBeans. -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[jira] [Updated] (NETBEANS-4880) Remove Derby integration from Payara Server components
[ https://issues.apache.org/jira/browse/NETBEANS-4880?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Gaurav Gupta updated NETBEANS-4880: --- Description: H2 is a Java-based Database which replaced Derby as the default database in Payara 5. Derby as a database service that can be started and managed by the Payara Platform, has been removed starting from version 5.201. So Derby integration can be removed from Payara Server modules of the Apache NetBeans IDE like the creation of Derby JDBC resource and connection pool from the Apache NetBeans IDE to Payara Server. was: H2 is a Java-based Database which replaced Derby as the default database in Payara 5. Derby as a database service that can be started and managed by Payara Server Enterprise, has been removed starting from version 5.201. So Derby integration can be removed from Payara Server modules of the Apache NetBeans IDE like the creation of Derby JDBC resource and connection pool from the Apache NetBeans IDE to Payara Server. > Remove Derby integration from Payara Server components > -- > > Key: NETBEANS-4880 > URL: https://issues.apache.org/jira/browse/NETBEANS-4880 > Project: NetBeans > Issue Type: Improvement > Components: serverplugins - Code >Affects Versions: 12.1 >Reporter: Gaurav Gupta >Assignee: Gaurav Gupta >Priority: Minor > Labels: pull-request-available > > H2 is a Java-based Database which replaced Derby as the default database in > Payara 5. Derby as a database service that can be started and managed by the > Payara Platform, has been removed starting from version 5.201. > So Derby integration can be removed from Payara Server modules of the Apache > NetBeans IDE like the creation of Derby JDBC resource and connection pool > from the Apache NetBeans IDE to Payara Server. -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[jira] [Updated] (NETBEANS-4880) Remove Derby integration from Payara Server components
[ https://issues.apache.org/jira/browse/NETBEANS-4880?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Gaurav Gupta updated NETBEANS-4880: --- Labels: pull-request-available (was: ) > Remove Derby integration from Payara Server components > -- > > Key: NETBEANS-4880 > URL: https://issues.apache.org/jira/browse/NETBEANS-4880 > Project: NetBeans > Issue Type: Improvement > Components: serverplugins - Code >Affects Versions: 12.1 >Reporter: Gaurav Gupta >Assignee: Gaurav Gupta >Priority: Minor > Labels: pull-request-available > > H2 is a Java-based Database which replaced Derby as the default database in > Payara 5. Derby as a database service that can be started and managed by > Payara Server Enterprise, has been removed starting from version 5.201. > So Derby integration can be removed from Payara Server modules of the Apache > NetBeans IDE like the creation of Derby JDBC resource and connection pool > from the Apache NetBeans IDE to Payara Server. -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[jira] [Created] (NETBEANS-4880) Remove Derby integration from Payara Server components
Gaurav Gupta created NETBEANS-4880: -- Summary: Remove Derby integration from Payara Server components Key: NETBEANS-4880 URL: https://issues.apache.org/jira/browse/NETBEANS-4880 Project: NetBeans Issue Type: Improvement Components: serverplugins - Code Affects Versions: 12.1 Reporter: Gaurav Gupta Assignee: Gaurav Gupta H2 is a Java-based Database which replaced Derby as the default database in Payara 5. Derby as a database service that can be started and managed by Payara Server Enterprise, has been removed starting from version 5.201. So Derby integration can be removed from Payara Server modules of the Apache NetBeans IDE like the creation of Derby JDBC resource and connection pool from the Apache NetBeans IDE to Payara Server. -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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
[jira] [Assigned] (NETBEANS-4559) Web Project Properties Dialog fails to save Relative URL
[ https://issues.apache.org/jira/browse/NETBEANS-4559?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Gaurav Gupta reassigned NETBEANS-4559: -- Assignee: Gaurav Gupta > Web Project Properties Dialog fails to save Relative URL > > > Key: NETBEANS-4559 > URL: https://issues.apache.org/jira/browse/NETBEANS-4559 > Project: NetBeans > Issue Type: Bug > Components: projects - Maven >Affects Versions: 11.3 >Reporter: Bernard >Assignee: Gaurav Gupta >Priority: Critical > Labels: pull-request-available > Attachments: ProjectPropertiesActionRun.png, > ProjectPropertiesActionRun.png, ProjectPropertiesRun.png, > PropertiesBefore.png, PropertiesBeforeAfter.png, WebSocketMovieTheater.zip, > image-2020-08-07-15-48-32-635.png, image-2020-08-09-11-54-50-908.png, > messages.log > > Time Spent: 10m > Remaining Estimate: 0h > > Please see attached images and project. > In the project properties, there is a field "Relative URL" for the page to > load relative to the context path. > If I enter it and confirm the dialog, then after re-opening the dialog again, > the value is lost. > > The project is from > [https://technology.amis.nl/2015/05/14/java-web-application-sending-json-messages-through-websocket-to-html5-browser-application-for-real-time-push/] > - just adapted to run under NetBeans. > -- This message was sent by Atlassian Jira (v8.3.4#803005) - 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 (73d9f30 -> af07816)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 73d9f30 Merge pull request #2403 from hectorespert/progress_api_swing add af07816 [NETBEANS-4864] - Fixed JavaDoc listing for class-type RECORD on auto-completion No new revisions were added by this update. Summary of changes: .../modules/java/completion/JavaDocumentationTask.java | 10 +- 1 file changed, 9 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 master updated: Add platform/api.progress.nb arch-what answer response
This is an automated email from the ASF dual-hosted git repository. jtulach 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 c07f24b Add platform/api.progress.nb arch-what answer response new 73d9f30 Merge pull request #2403 from hectorespert/progress_api_swing c07f24b is described below commit c07f24bf6f72fbcd11e3a93e18c80350865786aa Author: Hector Espert AuthorDate: Fri Sep 25 18:08:39 2020 +0200 Add platform/api.progress.nb arch-what answer response --- platform/api.progress.nb/arch.xml | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/api.progress.nb/arch.xml b/platform/api.progress.nb/arch.xml index f621650..559f60d 100644 --- a/platform/api.progress.nb/arch.xml +++ b/platform/api.progress.nb/arch.xml @@ -50,8 +50,9 @@ -Part of Progress API specialized for Swing UIs. + url="@org-netbeans-api-progress@/index.html"/> provides part of Progress API specialized for Swing UIs. + + Progress API was split so that parts that are directly connected to Swing types were migrated to this module. @@ -133,7 +134,7 @@ --> - XXX no answer for arch-what + Provides part of Progress API specialized for Swing UIs. - 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: [NETBEANS-3990] Sealed color and formatting (#2282)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 ff3e087 [NETBEANS-3990] Sealed color and formatting (#2282)
ff3e087 is described below
commit ff3e087c6f1f10db21852df17e2fc3839747b72f
Author: Akshay-Gupta-Oracle
<55184560+akshay-gupta-ora...@users.noreply.github.com>
AuthorDate: Wed Oct 7 18:57:50 2020 +0530
[NETBEANS-3990] Sealed color and formatting (#2282)
* [NETBEANS-3990] Sealed hint,color and formatting
* [NETBEANS-3990] Sealed hint,color and formatting
* [NETBEANS-3990] Sealed hint,color and formatting
* [NETBEANS-3990] Sealed code coloring
* [NETBEANS-3990] adding reformatting for sealed
* [NETBEANS-3990] Sealed color and formatting
* [NETBEANS-3990] Sealed hint,color and formatting
---
.../editor/base/semantic/ColoringAttributes.java | 1 -
.../base/semantic/SemanticHighlighterBase.java | 40 +++-
.../java/editor/base/semantic/DetectorTest.java| 41 -
.../netbeans/modules/java/source/TreeShims.java| 14 +++
.../modules/java/source/save/Reformatter.java | 21 +
.../modules/java/source/save/FormatingTest.java| 102 -
6 files changed, 212 insertions(+), 7 deletions(-)
diff --git
a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/ColoringAttributes.java
b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/ColoringAttributes.java
index 5681c09..f795eb3 100644
---
a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/ColoringAttributes.java
+++
b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/ColoringAttributes.java
@@ -30,7 +30,6 @@ import java.util.Set;
public enum ColoringAttributes {
UNUSED,
-
ABSTRACT,
FIELD,
diff --git
a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/SemanticHighlighterBase.java
b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/SemanticHighlighterBase.java
index 8146d84..711cf3e 100644
---
a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/SemanticHighlighterBase.java
+++
b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/SemanticHighlighterBase.java
@@ -71,6 +71,7 @@ import
org.netbeans.api.java.source.support.CancellableTreePathScanner;
import org.netbeans.api.lexer.PartType;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenHierarchy;
+import org.netbeans.api.lexer.TokenUtilities;
import org.netbeans.modules.java.editor.base.imports.UnusedImports;
import
org.netbeans.modules.java.editor.base.semantic.ColoringAttributes.Coloring;
import
org.netbeans.modules.java.editor.base.semantic.UnusedDetector.UnusedDescription;
@@ -367,7 +368,7 @@ public abstract class SemanticHighlighterBase extends
JavaParserResultTask {
}
boolean accessModifier = false;
-
+
if (decl.getModifiers().contains(Modifier.PUBLIC)) {
c.add(ColoringAttributes.PUBLIC);
accessModifier = true;
@@ -920,7 +921,19 @@ public abstract class SemanticHighlighterBase extends
JavaParserResultTask {
}
scan(tree.getExtendsClause(), null);
scan(tree.getImplementsClause(), null);
-
+try {
+List permitList = TreeShims.getPermits(tree);
+if (permitList != null && !permitList.isEmpty()) {
+tl.moveNext();
+Token t = firstIdentifierToken("permits");// NOI18N
+if (tl != null) {
+contextKeywords.add(t);
+scan(permitList, null);
+}
+}
+} catch (NullPointerException ex) {
+//Do nothing
+}
ExecutableElement prevRecursionDetector = recursionDetector;
recursionDetector = null;
@@ -1002,9 +1015,32 @@ public abstract class SemanticHighlighterBase extends
JavaParserResultTask {
handlePossibleIdentifier(tp, true,
info.getTrees().getElement(tp));
tl.moveToOffset(sourcePositions.getEndPosition(getCurrentPath().getCompilationUnit(),
TreeShims.getBindingPatternType(tree)));
firstIdentifier(tp, TreeShims.getBinding(tree).toString());
+} else if (tree != null && tree.getKind().equals(Kind.MODIFIERS)) {
+ visitModifier(tree);
}
return super.scan(tree, p);
}
+
+private void visitModifier(Tree tree) {
+
tl.moveToOffset(sourcePositions.getStartPosition(info.getCompilationUnit(),
tree));
+Token t = null;
+if
