[netbeans] branch master updated: Save/restore the ANTLR RustLexer specific internals. (#5624)
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 12f20e87a7 Save/restore the ANTLR RustLexer specific internals. (#5624)
12f20e87a7 is described below
commit 12f20e87a763cfa033ab614d7069c006e1c84174
Author: Laszlo Kishalmi
AuthorDate: Wed Mar 8 11:54:49 2023 -0800
Save/restore the ANTLR RustLexer specific internals. (#5624)
* Save/restore the ANTLR RustLexer specific internals.
* Use just the token type in RustLexerBase
---
.../modules/rust/grammar/RustLanguageLexer.java| 27 --
.../modules/rust/grammar/antlr4/RustLexerBase.java | 10
2 files changed, 30 insertions(+), 7 deletions(-)
diff --git
a/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/RustLanguageLexer.java
b/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/RustLanguageLexer.java
index 8d1892e6f2..80f365b70d 100644
---
a/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/RustLanguageLexer.java
+++
b/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/RustLanguageLexer.java
@@ -21,7 +21,6 @@ package org.netbeans.modules.rust.grammar;
import java.util.BitSet;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.antlr.v4.runtime.ANTLRErrorListener;
import org.antlr.v4.runtime.BaseErrorListener;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.Parser;
@@ -75,7 +74,7 @@ public class RustLanguageLexer extends
AbstractAntlrLexerBridge {
+final Integer lt1;
+final Integer lt2;
+
+LexerState(RustLexer lexer) {
+super(lexer);
+
+this.lt1 = lexer.lt1;
+this.lt2 = lexer.lt2;
+}
+
+@Override
+public void restore(RustLexer lexer) {
+super.restore(lexer);
+
+lexer.lt1 = lt1;
+lexer.lt2 = lt2;
+}
+}
}
diff --git
a/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/antlr4/RustLexerBase.java
b/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/antlr4/RustLexerBase.java
index 39c5919663..cefd4b7a5d 100644
---
a/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/antlr4/RustLexerBase.java
+++
b/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/antlr4/RustLexerBase.java
@@ -54,8 +54,8 @@ public abstract class RustLexerBase extends Lexer {
super(input);
}
-Token lt1;
-Token lt2;
+public Integer lt1;
+public Integer lt2;
@Override
public Token nextToken() {
@@ -85,7 +85,7 @@ public abstract class RustLexerBase extends Lexer {
if (next.getChannel() == Token.DEFAULT_CHANNEL) {
// Keep track of the last token on the default channel.
this.lt2 = this.lt1;
-this.lt1 = next;
+this.lt1 = next.getType();
}
return next;
@@ -130,10 +130,10 @@ public abstract class RustLexerBase extends Lexer {
if (this.lt1 == null || this.lt2 == null) {
return true;
}
-if (this.lt1.getType() != RustLexer.DOT) {
+if (this.lt1 != RustLexer.DOT) {
return true;
}
-switch (this.lt2.getType()) {
+switch (this.lt2) {
case RustLexer.CHAR_LITERAL:
case RustLexer.STRING_LITERAL:
case RustLexer.RAW_STRING_LITERAL:
-
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 (0eda4875c3 -> 94ad31f42c)
This is an automated email from the ASF dual-hosted git repository.
pepness pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 0eda4875c3 Add support for JPA 2.2 (#5582)
add 94ad31f42c Add support for GlassFish 7.0.2 (#5611)
No new revisions were added by this update.
Summary of changes:
.../modules/glassfish/common/Bundle.properties | 1 +
.../modules/glassfish/common/ServerDetails.java| 16 +++-
.../glassfish/tooling/admin/AdminFactory.java | 3 +
.../glassfish/tooling/data/GlassFishVersion.java | 10 +-
.../server/config/ConfigBuilderProvider.java | 7 +-
.../{GlassFishV7_0_0.xml => GlassFishV7_0_1.xml} | 5 +-
.../glassfish/tooling/admin/AdminFactoryTest.java | 104 +
.../tooling/data/GlassFishVersionTest.java | 10 +-
.../glassfish/tooling/utils/EnumUtilsTest.java | 14 +++
.../modules/glassfish/tooling/utils/JarTest.java | 2 +-
.../glassfish/tooling/utils/ServerUtilTest.java| 4 +-
11 files changed, 165 insertions(+), 11 deletions(-)
copy
enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/{GlassFishV7_0_0.xml
=> GlassFishV7_0_1.xml} (96%)
-
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-website] branch master updated: use prefixed tutorial images
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-website.git
The following commit(s) were added to refs/heads/master by this push:
new f03ab9809 use prefixed tutorial images
f03ab9809 is described below
commit f03ab9809fab1bf7755ab9b92ef37615ca973793
Author: Eric Barboni
AuthorDate: Wed Mar 8 11:18:09 2023 +0100
use prefixed tutorial images
---
.../src/content/tutorials/nbm-quick-start.adoc | 86 +++---
1 file changed, 43 insertions(+), 43 deletions(-)
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-quick-start.adoc
b/netbeans.apache.org/src/content/tutorials/nbm-quick-start.adoc
index 0abf83c94..366bbe4e2 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-quick-start.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-quick-start.adoc
@@ -74,7 +74,7 @@ In this section, you create your first NetBeans Platform
application.
1. Choose File | New Project and then choose NetBeans Modules. Select
"NetBeans Platform Application". You should see this:
-image::images/nbm-quick-start/new-project-1.png[]
+image::images/quickstart-platform_73_new-project-1.png[]
The difference between the 4 templates above is as follows:
@@ -90,7 +90,7 @@ Click btn:[Next].
1. Name your new application `WordProcessor` and specify a folder on disk for
storing it:
-image::images/nbm-quick-start/new-project-2.png[]
+image::images/quickstart-platform_73_new-project-2.png[]
Click btn:[Finish]. The new project appears as follows in the Projects window:
@@ -107,13 +107,13 @@ In this section, you create your first NetBeans Platform
module.
1. Right-click the "Modules" node, shown in the screenshot above, and choose
"Add New":
-image::images/nbm-quick-start/new-module-1.png[]
+image::images/quickstart-platform_73_new-module-1.png[]
The New Module Project dialog will appear.
Name the new module `WordEditorCore`:
-image::images/nbm-quick-start/new-module-2.png[]
+image::images/quickstart-platform_73_new-module-2.png[]
Click btn:[Next].
@@ -122,12 +122,12 @@ Click btn:[Next].
1. Specify "org.word.editor.core" as the Code Name Base, which is a unique
string identifying the module. The Module Display Name is used as a label for
the module in the Projects window.
-image::images/nbm-quick-start/new-module-3.png[]
+image::images/quickstart-platform_73_new-module-3.png[]
Click btn:[Finish]. The new module is created and its structure is shown in
the Projects window:
-image::images/nbm-quick-start/new-module-4.png[]
+image::images/quickstart-platform_73_new-module-4.png[]
=== Create the Window
@@ -138,11 +138,11 @@ Having created a module, you now create your first
NetBeans window.
[start=1]
1. Right-click the "WordEditorCore" module and choose New | Other.
-image::images/nbm-quick-start/new-window-1.png[]
+image::images/quickstart-platform_73_new-window-1.png[]
The New File dialog appears. In the Module Development category, select
"Window":
-image::images/nbm-quick-start/new-window-2.png[]
+image::images/quickstart-platform_73_new-window-2.png[]
Click btn:[Next].
@@ -159,11 +159,11 @@ Then click btn:[Next].
[start=3]
1. Set the class name prefix to `Word` and the package to
`org.word.editor.core`:
-image::images/nbm-quick-start/new-window-4.png[]
+image::images/quickstart-platform_73_new-window-4.png[]
Click btn:[Finish]. The new window ("WordTopComponent.java") is added to the
source structure of your module:
-image::images/nbm-quick-start/new-window-5.png[]
+image::images/quickstart-platform_73_new-window-5.png[]
[start=4]
1. The new window should have opened in the Design view of the "Matisse" GUI
Builder. You can double-click (or select "Open" from the context menu) it if
it didn't open automatically.
@@ -172,14 +172,14 @@ image::images/nbm-quick-start/new-window-6.png[]
The Palette should be open on the right side (you can use menu:Window[IDE
Tools>Palette] or kbd:[Ctrl+Shift+8] if not). Drag and drop a Button and a Text
Area from the Palette onto the window:
-image::images/nbm-quick-start/new-window-7.png[]
+image::images/quickstart-platform_73_new-window-7.png[]
Do the following to make the new GUI components more meaningful:
* Right-click the text area, choose "Change Variable Name", and then name it
`text`.
* Right-click the button, choose "Edit Text", and then set the text of the
button to `Filter!`. Also rename the variable to `filterButton`.
-image::images/nbm-quick-start/new-window-7.png[]
+image::images/quickstart-platform_73_new-window-7.png[]
[start=5]
1. Double click on the button. This will create an event handling method in
the Source editor. The method is called whenever the button is clicked. Change
the body of the method to the following code:
@@ -206,12 +206,12 @@ In this section, you deploy the application.
[start=1]
1.
