(netbeans) branch master updated: HCL added Scoped Function name support (Terraform 1.8)
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 8c75f2df42 HCL added Scoped Function name support (Terraform 1.8) 8c75f2df42 is described below commit 8c75f2df4215223866aceb88fe9981c5c2ac8e81 Author: Laszlo Kishalmi AuthorDate: Sun Apr 14 19:50:16 2024 -0700 HCL added Scoped Function name support (Terraform 1.8) --- .../netbeans/modules/languages/hcl/HCLTokenId.java| 1 + .../modules/languages/hcl/ast/HCLElementFactory.java | 8 .../languages/hcl/ast/HCLExpressionFactory.java | 19 +-- .../modules/languages/hcl/ast/HCLIdentifier.java | 2 ++ .../languages/hcl/grammar/g4/HCLExpressionParser.g4 | 10 -- .../modules/languages/hcl/grammar/g4/HCLLexer.g4 | 9 +++-- 6 files changed, 39 insertions(+), 10 deletions(-) diff --git a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLTokenId.java b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLTokenId.java index f214a20c06..afd23ae588 100644 --- a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLTokenId.java +++ b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLTokenId.java @@ -56,6 +56,7 @@ public enum HCLTokenId implements TokenId { INTERPOLATION_START("${", "separator"), INTERPOLATION_END("}", "separator"), RARROW("=>", "separator"), +SCOPE("::", "separator"), TEMPLATE_START("%{", "separator"), TEMPLATE_END("}", "separator"), diff --git a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLElementFactory.java b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLElementFactory.java index 3b84857a1f..03058ff880 100644 --- a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLElementFactory.java +++ b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLElementFactory.java @@ -23,6 +23,7 @@ import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.tree.TerminalNode; import org.netbeans.modules.languages.hcl.grammar.HCLLexer; +import org.netbeans.modules.languages.hcl.grammar.HCLParser; /** * @@ -41,6 +42,13 @@ public sealed abstract class HCLElementFactory permits HCLBlockFactory, HCLExpre return tn != null ? id(tn.getSymbol()) : null; } +protected final HCLIdentifier id(HCLParser.ScopedIdContext ctx) { +HCLIdentifier parent = ctx.target != null +? id(ctx.target) +: id(ctx.scopedId()); +return created(new HCLIdentifier.ScopedId(parent, ctx.ref.getText()), ctx); +} + protected final HCLIdentifier id(Token t) { return (t != null) && (t.getType() == HCLLexer.IDENTIFIER) ? created(new HCLIdentifier.SimpleId(t.getText()), t) : null; } diff --git a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLExpressionFactory.java b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLExpressionFactory.java index 455ae4806b..cca7c87026 100644 --- a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLExpressionFactory.java +++ b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLExpressionFactory.java @@ -27,6 +27,7 @@ import java.util.function.Consumer; import org.antlr.v4.runtime.NoViableAltException; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.tree.ParseTree; +import org.antlr.v4.runtime.tree.TerminalNode; import org.netbeans.modules.languages.hcl.grammar.HCLLexer; import static org.netbeans.modules.languages.hcl.grammar.HCLLexer.*; import org.netbeans.modules.languages.hcl.grammar.HCLParser; @@ -175,16 +176,22 @@ public final class HCLExpressionFactory extends HCLElementFactory { if (ctx == null) { return null; } -List args = Collections.emptyList(); +if (ctx.exception != null) { +return null; +} +List args = List.of(); boolean expand = false; if (ctx.arguments() != null) { -args = new ArrayList<>(ctx.arguments().expression().size()); -for (HCLParser.ExpressionContext ectx : ctx.arguments().expression()) { -args.add(expr(ectx)); -} +args = ctx.arguments().expression().stream() +.map(this::expr) +.toList(); expand = ctx.arguments().ELLIPSIS() != null; } -return created(new HCLFunction(id(ctx.IDENTIFIER()), args, expand), ctx); +HCLIdentifier name = ctx.IDENTIFIER() != null +? id(ctx.IDENTIFIER()) +: id(ctx.scopedId()); + +return created(new HCLFunction(name, args, expand), ctx); } private static HCLArithmeticOperation.Operator binOp(int tokenType) {
(netbeans) branch master updated (886d5d5b1e -> d20d7e4075)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 886d5d5b1e Merge pull request #7262 from dbalek/dbalek/mictonaut-cc-fix add a053b51f24 Fix generation of font color value for JavaScript debugger add 70e4349a08 Implement Node Debugging Support using Chrome DevTools Protocol add 83b1b4a969 Enable multiple javascript debuggers (V8 protocol, CDT protocol, GraalVM) add 2f3db018c8 JS-Breakpoint list should show hit state as JPDA add 74fe6f5fe6 Add TS Mimetypes to JS debugger add 91431f6c2d JS sourcemap: Handle unmappable files in debug frames new d20d7e4075 Merge pull request #4220 from matthiasblaesing/chrome_devtools_protocol The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ide/javascript2.debug.ui/nbproject/project.xml |1 + .../modules/javascript2/debug/ui/JSUtils.java |3 +- .../debug/ui/breakpoints/JSLineBreakpointType.java | 15 +- .../ToggleBreakpointActionProvider.java| 15 +- .../debug/ui/models/ViewModelSupport.java | 62 +- .../ui/models/breakpoints/BreakpointNodeModel.java | 12 +- ide/javascript2.debug/nbproject/project.xml|2 + .../debug/breakpoints/JSBreakpointStatus.java |7 + .../debug/breakpoints/JSLineBreakpoint.java| 20 +- .../debug/sources/SourceFilesCache.java|8 +- ide/web.common/nbproject/project.xml |2 + .../web/common/sourcemap/SourceMapsTranslator.java |2 +- .../common/sourcemap/SourceMapsTranslatorImpl.java |3 +- java/debugger.jpda.trufflenode/manifest.mf |1 + .../nbproject/project.xml |9 - .../debugger/jpda/truffle/node/Bundle.properties |1 + .../node/DebuggerStartModifierFactoryImpl.java | 36 + ...xtender.java => DebuggerStartModifierImpl.java} | 19 +- .../modules/debugger/jpda/truffle/node/layer.xml | 33 + nbbuild/cluster.properties |3 + webcommon/javascript.cdtdebug.ui/build.xml | 26 + webcommon/javascript.cdtdebug.ui/manifest.mf |6 + .../nbproject/project.properties} |8 +- .../javascript.cdtdebug.ui}/nbproject/project.xml | 74 +- .../org.netbeans.spi.viewmodel.ColumnModel |0 .../javascript/cdtdebug/ui}/Bundle.properties |6 +- .../ui/CDTDebuggerEngineComponentsProvider.java| 110 +++ .../javascript/cdtdebug/ui/EditorUtils.java| 99 ++ .../ui/actions/CDTDebugActionsProvider.java| 147 +++ .../ui/annotation/CallStackAnnotation.java | 44 + .../ui/annotation/CallStackAnnotationListener.java | 215 + .../ui/annotation/CurrentLineAnnotation.java | 44 + .../cdtdebug/ui/attach/AttachCustomizer.form | 181 .../cdtdebug}/ui/attach/AttachCustomizer.java | 55 +- .../cdtdebug}/ui/attach/Bundle.properties |0 .../cdtdebug/ui/attach/CDTAttachType.java} | 16 +- .../ui/callstack/DebuggingViewSupportImpl.java | 116 +++ .../javascript/cdtdebug/ui/callstack/JSThread.java | 133 +++ .../ui/callstack/models/DebuggingActionsModel.java | 160 .../ui/callstack/models/DebuggingModel.java| 275 ++ .../cdtdebug/ui/eval/CDTCodeEvaluator.java | 158 +++ .../cdtdebug/ui/eval/EvaluationResultsModel.java | 304 ++ .../javascript/cdtdebug/ui/eval/VarOrError.java| 50 + .../cdtdebug/ui/models/DebuggingActionsModel.java | 160 .../cdtdebug/ui/models/DebuggingModel.java | 262 + .../cdtdebug}/ui/resources/Bundle.properties |0 .../javascript/cdtdebug/ui/resources/mf-layer.xml | 201 .../ui/vars/models/PinWatchValueProvider.java | 209 .../cdtdebug/ui/vars/models/VariablesModel.java| 399 .../cdtdebug/ui/vars/models/WatchesModel.java | 501 ++ .../ui/vars/tooltip/ToolTipAnnotation.java | 105 ++ webcommon/javascript.cdtdebug/build.xml| 26 + .../manifest.mf|5 +- .../nbproject/project.properties} |8 +- .../nbproject/project.xml | 39 +- .../modules/javascript/cdtdebug}/Bundle.properties |8 +- .../modules/javascript/cdtdebug/CDTDebugger.java | 256 + .../cdtdebug/CDTDebuggerEngineProvider.java| 58 ++ .../cdtdebug/CDTDebuggerSessionProvider.java | 71 ++ .../modules/javascript/cdtdebug/CDTScript.java | 116 +++ .../javascript/cdtdebug/ScriptsHandler.java| 548 +++ .../cdtdebug/actions/CDTDebugActionsProvider.java | 156 +++ .../modules/javascript/cdtdebug/api/Connector.java |
(netbeans) 01/01: Merge pull request #4220 from matthiasblaesing/chrome_devtools_protocol
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 commit d20d7e407574a3635f34181c6a7dd94622d722bf Merge: 886d5d5b1e 91431f6c2d Author: Matthias Bläsing AuthorDate: Mon Apr 15 19:59:03 2024 +0200 Merge pull request #4220 from matthiasblaesing/chrome_devtools_protocol Add support for Chrome DevTools Protocol for NodeJS Debugging ide/javascript2.debug.ui/nbproject/project.xml |1 + .../modules/javascript2/debug/ui/JSUtils.java |3 +- .../debug/ui/breakpoints/JSLineBreakpointType.java | 15 +- .../ToggleBreakpointActionProvider.java| 15 +- .../debug/ui/models/ViewModelSupport.java | 62 +- .../ui/models/breakpoints/BreakpointNodeModel.java | 12 +- ide/javascript2.debug/nbproject/project.xml|2 + .../debug/breakpoints/JSBreakpointStatus.java |7 + .../debug/breakpoints/JSLineBreakpoint.java| 20 +- .../debug/sources/SourceFilesCache.java|8 +- ide/web.common/nbproject/project.xml |2 + .../web/common/sourcemap/SourceMapsTranslator.java |2 +- .../common/sourcemap/SourceMapsTranslatorImpl.java |3 +- java/debugger.jpda.trufflenode/manifest.mf |1 + .../nbproject/project.xml |9 - .../debugger/jpda/truffle/node/Bundle.properties |1 + .../node/DebuggerStartModifierFactoryImpl.java | 36 + ...xtender.java => DebuggerStartModifierImpl.java} | 19 +- .../modules/debugger/jpda/truffle/node/layer.xml | 33 + nbbuild/cluster.properties |3 + webcommon/javascript.cdtdebug.ui/build.xml | 26 + webcommon/javascript.cdtdebug.ui/manifest.mf |6 + .../nbproject/project.properties} |8 +- .../javascript.cdtdebug.ui}/nbproject/project.xml | 74 +- .../org.netbeans.spi.viewmodel.ColumnModel |4 + .../javascript/cdtdebug/ui}/Bundle.properties |6 +- .../ui/CDTDebuggerEngineComponentsProvider.java| 110 +++ .../javascript/cdtdebug/ui/EditorUtils.java| 99 ++ .../ui/actions/CDTDebugActionsProvider.java| 147 +++ .../ui/annotation/CallStackAnnotation.java | 44 + .../ui/annotation/CallStackAnnotationListener.java | 215 + .../ui/annotation/CurrentLineAnnotation.java | 44 + .../cdtdebug/ui/attach/AttachCustomizer.form | 181 .../cdtdebug}/ui/attach/AttachCustomizer.java | 55 +- .../cdtdebug/ui/attach}/Bundle.properties | 10 +- .../cdtdebug/ui/attach/CDTAttachType.java} | 16 +- .../ui/callstack/DebuggingViewSupportImpl.java | 116 +++ .../javascript/cdtdebug/ui/callstack/JSThread.java | 133 +++ .../ui/callstack/models/DebuggingActionsModel.java | 160 .../ui/callstack/models/DebuggingModel.java| 275 ++ .../cdtdebug/ui/eval/CDTCodeEvaluator.java | 158 +++ .../cdtdebug/ui/eval/EvaluationResultsModel.java | 304 ++ .../javascript/cdtdebug/ui/eval/VarOrError.java| 50 + .../cdtdebug/ui/models/DebuggingActionsModel.java | 160 .../cdtdebug/ui/models/DebuggingModel.java | 262 + .../cdtdebug/ui/resources}/Bundle.properties |5 +- .../javascript/cdtdebug/ui/resources/mf-layer.xml | 201 .../ui/vars/models/PinWatchValueProvider.java | 209 .../cdtdebug/ui/vars/models/VariablesModel.java| 399 .../cdtdebug/ui/vars/models/WatchesModel.java | 501 ++ .../ui/vars/tooltip/ToolTipAnnotation.java | 105 ++ webcommon/javascript.cdtdebug/build.xml| 26 + .../manifest.mf|5 +- .../nbproject/project.properties} |8 +- .../nbproject/project.xml | 39 +- .../modules/javascript/cdtdebug}/Bundle.properties |8 +- .../modules/javascript/cdtdebug/CDTDebugger.java | 256 + .../cdtdebug/CDTDebuggerEngineProvider.java| 58 ++ .../cdtdebug/CDTDebuggerSessionProvider.java | 71 ++ .../modules/javascript/cdtdebug/CDTScript.java | 116 +++ .../javascript/cdtdebug/ScriptsHandler.java| 548 +++ .../cdtdebug/actions/CDTDebugActionsProvider.java | 156 +++ .../modules/javascript/cdtdebug/api/Connector.java | 145 +++ .../cdtdebug/breakpoints/BreakpointsHandler.java | 296 ++ .../breakpoints/CDTBreakpointsActivation.java | 91 ++ .../breakpoints/CDTBreakpointsActiveService.java | 138 +++ .../cdtdebug/breakpoints/JSBreakpointsManager.java | 122 +++ .../netbeans/modules/javascript/cdtdebug/layer.xml | 33 + .../nodejs/DebuggerStartModifierFactoryImpl.java | 35 + .../cdtdebug/nodejs/DebuggerStartModifierImpl.java | 120 +++ .../cdtdebug/sessions/SessionSwitcher.java | 73 ++ .../cdtdebug/sources/ChangeLiveSupport.java| 239 +
(netbeans) 01/01: Merge pull request #7262 from dbalek/dbalek/mictonaut-cc-fix
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 commit 886d5d5b1eb577596857d1e4367585eb870302fe Merge: 662cc57168 698c544b5b Author: Dusan Balek AuthorDate: Mon Apr 15 14:24:22 2024 +0200 Merge pull request #7262 from dbalek/dbalek/mictonaut-cc-fix Micronaut: code completion for update methods fixed. .../completion/MicronautDataCompletionTask.java | 21 - 1 file changed, 12 insertions(+), 9 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
(netbeans) branch master updated (662cc57168 -> 886d5d5b1e)
This is an automated email from the ASF dual-hosted git repository. dbalek pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 662cc57168 Merge pull request #7267 from lkishalmi/fix-lsp-gradle-wizard-test add 698c544b5b Micronaut: code completion for update methods fixed. new 886d5d5b1e Merge pull request #7262 from dbalek/dbalek/mictonaut-cc-fix The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../completion/MicronautDataCompletionTask.java | 21 - 1 file changed, 12 insertions(+), 9 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