Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions data-weave-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ intellij {
updateSinceUntilBuild = false
}

tasks.named('runIde') {
jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005'
}

task downloadAgentServerDependencies(type: Copy) {
from configurations.agentServerLibs
into "$projectDir/src/main/resources/agent-server-libs"
Expand Down

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ public class WeaveGlobalDefinitionsIndexer extends FileBasedIndexExtension<Strin
PsiElement nameIdentifier = functionDefinition.getNameIdentifier();
if (nameIdentifier != null) {
TextRange textRange = nameIdentifier.getTextRange();
int scope = directive.isPrivate() ? IdentifierScope.PRIVATE() : IdentifierScope.PUBLIC();
int scope = directive.isPrivate() ? IdentifierScope.PRIVATE() :
(directive.isInternal() ? IdentifierScope.INTERNAL() : IdentifierScope.PUBLIC());
weaveIdentifiers.add(new GlobalElementIdentifier(textRange.getStartOffset(),
textRange.getEndOffset(),
functionDefinition.getName(),
Expand All @@ -66,7 +67,8 @@ public class WeaveGlobalDefinitionsIndexer extends FileBasedIndexExtension<Strin
List<GlobalElementIdentifier> weaveIdentifiers = result.computeIfAbsent(fqn, k -> new ArrayList<>());
PsiElement nameIdentifier = variableDefinition.getNameIdentifier();
if (nameIdentifier != null) {
int scope = directive.isPrivate() ? IdentifierScope.PRIVATE() : IdentifierScope.PUBLIC();
int scope = directive.isPrivate() ? IdentifierScope.PRIVATE() :
(directive.isInternal() ? IdentifierScope.INTERNAL() : IdentifierScope.PUBLIC());
TextRange textRange = nameIdentifier.getTextRange();
weaveIdentifiers.add(new GlobalElementIdentifier(textRange.getStartOffset(),
textRange.getEndOffset(),
Expand All @@ -85,7 +87,8 @@ public class WeaveGlobalDefinitionsIndexer extends FileBasedIndexExtension<Strin
List<GlobalElementIdentifier> weaveIdentifiers = result.computeIfAbsent(fqn, k -> new ArrayList<>());
PsiElement nameIdentifier = typeDefinition.getNameIdentifier();
if (nameIdentifier != null) {
int scope = directive.isPrivate() ? IdentifierScope.PRIVATE() : IdentifierScope.PUBLIC();
int scope = directive.isPrivate() ? IdentifierScope.PRIVATE() :
(directive.isInternal() ? IdentifierScope.INTERNAL() : IdentifierScope.PUBLIC());
TextRange textRange = nameIdentifier.getTextRange();
weaveIdentifiers.add(new GlobalElementIdentifier(textRange.getStartOffset(),
textRange.getEndOffset(),
Expand Down Expand Up @@ -149,7 +152,7 @@ private void serialize(GlobalElementIdentifier entry, DataOutput out) throws IOE

@Override
public int getVersion() {
return 0;
return 1; // Incremented for internal scope support
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ CARET_SPACE="^"[\ \t\f\n]

"%dw" { return VERSION_DIRECTIVE_KEYWORD;}
"private" { return PRIVATE_KEYWORD;}
"internal" { return INTERNAL_KEYWORD;}
"input" { return INPUT_DIRECTIVE_KEYWORD;}
"output" { return OUTPUT_DIRECTIVE_KEYWORD;}
"annotation" { return ANNOTATION_DIRECTIVE_KEYWORD;}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
INPUT_DIRECTIVE_KEYWORD="input"
VAR_DIRECTIVE_KEYWORD="var"
PRIVATE_KEYWORD="private"
INTERNAL_KEYWORD="internal"
FUNCTION_DIRECTIVE_KEYWORD="fun"
ANNOTATION_DIRECTIVE_KEYWORD="annotation"
NAMESPACE_DIRECTIVE_KEYWORD="ns"
Expand Down Expand Up @@ -148,7 +149,7 @@ AnnotationDefinition ::= Identifier '('( AnnotationParameter ( ',' AnnotationPar

AnnotationParameter::= ((Identifier) ':' TypeLiteral) ('=' AnnotatedExpression)?

private HeaderRecover::= !('---'|OUTPUT_DIRECTIVE_KEYWORD|'type'|'fun'|'ns'|'var'|'%dw'|'input'|IMPORT_DIRECTIVE_KEYWORD | '@' | 'annotation' | 'private')
private HeaderRecover::= !('---'|OUTPUT_DIRECTIVE_KEYWORD|'type'|'fun'|'ns'|'var'|'%dw'|'input'|IMPORT_DIRECTIVE_KEYWORD | '@' | 'annotation' | 'private' | 'internal')

VersionDirective::= Annotation* '%dw' DOUBLE_LITERAL {pin=2}

Expand All @@ -163,9 +164,9 @@ ImportedElement::= Identifier ('as' ImportedElementAlias)? {

ImportedElementAlias::=Identifier

NamespaceDirective::= Annotation* 'private'? 'ns' NamespaceDefinition {
methods = [ isPrivate ]
pin = 3
NamespaceDirective::= Annotation* 'private'? 'internal'? 'ns' NamespaceDefinition {
methods = [ isPrivate isInternal ]
pin = 4
}

NamespaceDefinition::=Identifier NAMESPACE_URI
Expand All @@ -176,16 +177,16 @@ NamespaceDefinition::=Identifier NAMESPACE_URI
pin=1
}

VariableDirective::= Annotation* 'private'? 'var' VariableDefinition {
methods = [ isPrivate ]
pin = 3
VariableDirective::= Annotation* 'private'? 'internal'? 'var' VariableDefinition {
methods = [ isPrivate isInternal ]
pin = 4
}

OutputDirective::= Annotation* OUTPUT_DIRECTIVE_KEYWORD (":" Type)? ((DataFormat ('with' Identifier)?) | Identifier) Options? {pin=2}

TypeDirective::= Annotation* 'private'? 'type' TypeDefinition {
methods = [ isPrivate ]
pin = 3
TypeDirective::= Annotation* 'private'? 'internal'? 'type' TypeDefinition {
methods = [ isPrivate isInternal ]
pin = 4
}

TypeDefinition::=Identifier TypeParameterDeclaration? '=' (TypeLiteral | UndefinedLiteral)
Expand All @@ -196,9 +197,9 @@ TypeDefinition::=Identifier TypeParameterDeclaration? '=' (TypeLiteral | Undefin
pin=1
}

FunctionDirective::= Annotation* 'private'? 'fun' FunctionDefinition {
methods = [ isPrivate ]
pin = 3
FunctionDirective::= Annotation* 'private'? 'internal'? 'fun' FunctionDefinition {
methods = [ isPrivate isInternal ]
pin = 4
}

FunctionDefinition::=Identifier TypeParameterDeclaration? L_PARREN ( FunctionParameter ( ',' FunctionParameter )* )? (",")? R_PARREN ( ":" (Type | DynamicReturn)? "=" | "=")? AnnotatedExpression
Expand Down
Loading