From 73863044577d980585b3b6b4f6bc2f71fbbfa048 Mon Sep 17 00:00:00 2001 From: sariel Date: Mon, 1 Nov 2021 15:55:46 +0200 Subject: Fix a missing import --- .../java/org/intellij/sdk/language/SdLexerAdapter.java | 15 --------------- .../org/intellij/sdk/language/lexer/SdLexerAdapter.java | 15 +++++++++++++++ .../src/main/java/org/intellij/sdk/language/lexer/sd.flex | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 sd-plugin/src/main/java/org/intellij/sdk/language/SdLexerAdapter.java create mode 100644 sd-plugin/src/main/java/org/intellij/sdk/language/lexer/SdLexerAdapter.java diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/SdLexerAdapter.java b/sd-plugin/src/main/java/org/intellij/sdk/language/SdLexerAdapter.java deleted file mode 100644 index 58329222a19..00000000000 --- a/sd-plugin/src/main/java/org/intellij/sdk/language/SdLexerAdapter.java +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package org.intellij.sdk.language; - -import com.intellij.lexer.FlexAdapter; - -/** - * This class adapts the JFlex lexer to the IntelliJ Platform Lexer API. - * @author Shahar Ariel - */ -public class SdLexerAdapter extends FlexAdapter { - - public SdLexerAdapter() { - super(new org.intellij.sdk.language.SdLexer(null)); - } -} diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/lexer/SdLexerAdapter.java b/sd-plugin/src/main/java/org/intellij/sdk/language/lexer/SdLexerAdapter.java new file mode 100644 index 00000000000..c7463fc9823 --- /dev/null +++ b/sd-plugin/src/main/java/org/intellij/sdk/language/lexer/SdLexerAdapter.java @@ -0,0 +1,15 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package org.intellij.sdk.language.lexer; + +import com.intellij.lexer.FlexAdapter; + +/** + * This class adapts the JFlex lexer to the IntelliJ Platform Lexer API. + * @author Shahar Ariel + */ +public class SdLexerAdapter extends FlexAdapter { + + public SdLexerAdapter() { + super(new SdLexer(null)); + } +} diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/lexer/sd.flex b/sd-plugin/src/main/java/org/intellij/sdk/language/lexer/sd.flex index 47dddb9c33f..235b494cb0e 100644 --- a/sd-plugin/src/main/java/org/intellij/sdk/language/lexer/sd.flex +++ b/sd-plugin/src/main/java/org/intellij/sdk/language/lexer/sd.flex @@ -1,4 +1,4 @@ -package org.intellij.sdk.language; +package org.intellij.sdk.language.lexer; import com.intellij.lexer.FlexLexer; import com.intellij.psi.tree.IElementType; -- cgit v1.2.3 From cc97041e291c4fe470d402c7ad74064f342d51bf Mon Sep 17 00:00:00 2001 From: sariel Date: Mon, 1 Nov 2021 15:57:00 +0200 Subject: Add implementations for deprecated methods (Jetbrains requirement) --- .../intellij/sdk/language/findUsages/SdUsageGroup.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdUsageGroup.java b/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdUsageGroup.java index 0423db89cd6..b67c561e8d4 100644 --- a/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdUsageGroup.java +++ b/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdUsageGroup.java @@ -9,6 +9,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.SmartPointerManager; import com.intellij.psi.SmartPsiElementPointer; import com.intellij.usages.UsageGroup; +import com.intellij.usages.UsageView; import org.intellij.sdk.language.psi.SdDeclaration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -59,7 +60,8 @@ public class SdUsageGroup implements UsageGroup { @Override public int compareTo(@NotNull UsageGroup usageGroup) { - return getPresentableGroupText().compareToIgnoreCase(usageGroup.getPresentableGroupText()); +// return getPresentableGroupText().compareToIgnoreCase(usageGroup.getPresentableGroupText()); + return getText(null).compareTo(usageGroup.getText(null)); } @Override @@ -91,6 +93,18 @@ public class SdUsageGroup implements UsageGroup { return myIcon; } + // here because JetBrains asked: + + @SuppressWarnings("deprecation") + public Icon getIcon(boolean isOpen) { + return myIcon; + } + + @SuppressWarnings("deprecation") + public String getText(UsageView view) { + return myText; + } + @Override - public void update() {} // here because JetBrains asked + public void update() {} } -- cgit v1.2.3 From 19ede09621328e7a24d90d0bd94f83451efb1932 Mon Sep 17 00:00:00 2001 From: sariel Date: Mon, 1 Nov 2021 15:58:47 +0200 Subject: Change SdLexerAdapter directory --- .../src/main/java/org/intellij/sdk/language/SdSyntaxHighlighter.java | 1 + .../java/org/intellij/sdk/language/findUsages/SdFindUsagesProvider.java | 2 +- .../main/java/org/intellij/sdk/language/parser/SdParserDefinition.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/SdSyntaxHighlighter.java b/sd-plugin/src/main/java/org/intellij/sdk/language/SdSyntaxHighlighter.java index aaceaaa02cd..7ff108fc8f6 100644 --- a/sd-plugin/src/main/java/org/intellij/sdk/language/SdSyntaxHighlighter.java +++ b/sd-plugin/src/main/java/org/intellij/sdk/language/SdSyntaxHighlighter.java @@ -10,6 +10,7 @@ import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.fileTypes.SyntaxHighlighterBase; import com.intellij.psi.TokenType; import com.intellij.psi.tree.IElementType; +import org.intellij.sdk.language.lexer.SdLexerAdapter; import org.intellij.sdk.language.psi.SdTypes; import org.jetbrains.annotations.NotNull; diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdFindUsagesProvider.java b/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdFindUsagesProvider.java index 56aaae6d02a..e3eb6b431c7 100644 --- a/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdFindUsagesProvider.java +++ b/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdFindUsagesProvider.java @@ -7,7 +7,7 @@ import com.intellij.lang.findUsages.FindUsagesProvider; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNamedElement; import com.intellij.psi.tree.TokenSet; -import org.intellij.sdk.language.SdLexerAdapter; +import org.intellij.sdk.language.lexer.SdLexerAdapter; import org.intellij.sdk.language.psi.SdDeclaration; import org.intellij.sdk.language.psi.SdIdentifierVal; import org.intellij.sdk.language.psi.SdIdentifierWithDashVal; diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/parser/SdParserDefinition.java b/sd-plugin/src/main/java/org/intellij/sdk/language/parser/SdParserDefinition.java index fbaa8d0cac5..0497f0b4960 100644 --- a/sd-plugin/src/main/java/org/intellij/sdk/language/parser/SdParserDefinition.java +++ b/sd-plugin/src/main/java/org/intellij/sdk/language/parser/SdParserDefinition.java @@ -13,7 +13,7 @@ import com.intellij.psi.TokenType; import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.TokenSet; import org.intellij.sdk.language.SdLanguage; -import org.intellij.sdk.language.SdLexerAdapter; +import org.intellij.sdk.language.lexer.SdLexerAdapter; import org.intellij.sdk.language.psi.SdFile; import org.intellij.sdk.language.psi.SdTypes; import org.jetbrains.annotations.NotNull; -- cgit v1.2.3 From c6bbb8978db89ab7bc9a53b8006e3a739ee34f0a Mon Sep 17 00:00:00 2001 From: sariel Date: Mon, 1 Nov 2021 16:42:20 +0200 Subject: Define buildPlugin task as a default task --- sd-plugin/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sd-plugin/build.gradle b/sd-plugin/build.gradle index 90a137ce473..0a4798032d9 100644 --- a/sd-plugin/build.gradle +++ b/sd-plugin/build.gradle @@ -9,6 +9,8 @@ plugins { id 'maven-publish' // to deploy the plugin into a Maven repo } +defaultTasks 'buildPlugin' + apply plugin: 'org.jetbrains.grammarkit' import org.jetbrains.grammarkit.tasks.GenerateLexer @@ -36,7 +38,7 @@ compileJava { group 'org.yahoo.native' -version '1.0.0' +version '1.0.1' sourceCompatibility = 11 -- cgit v1.2.3 From 99726891beafb7a37967fd50a8d72c9dcd3c2d13 Mon Sep 17 00:00:00 2001 From: sariel Date: Mon, 1 Nov 2021 16:51:28 +0200 Subject: Add Gradle configurations to git --- sd-plugin/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59536 bytes sd-plugin/gradle/wrapper/gradle-wrapper.properties | 5 + sd-plugin/gradlew | 185 +++++++++++++++++++++ sd-plugin/gradlew.bat | 89 ++++++++++ 4 files changed, 279 insertions(+) create mode 100644 sd-plugin/gradle/wrapper/gradle-wrapper.jar create mode 100644 sd-plugin/gradle/wrapper/gradle-wrapper.properties create mode 100755 sd-plugin/gradlew create mode 100644 sd-plugin/gradlew.bat diff --git a/sd-plugin/gradle/wrapper/gradle-wrapper.jar b/sd-plugin/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000000..7454180f2ae Binary files /dev/null and b/sd-plugin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/sd-plugin/gradle/wrapper/gradle-wrapper.properties b/sd-plugin/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..69a9715077f --- /dev/null +++ b/sd-plugin/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/sd-plugin/gradlew b/sd-plugin/gradlew new file mode 100755 index 00000000000..744e882ed57 --- /dev/null +++ b/sd-plugin/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MSYS* | MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/sd-plugin/gradlew.bat b/sd-plugin/gradlew.bat new file mode 100644 index 00000000000..107acd32c4e --- /dev/null +++ b/sd-plugin/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega -- cgit v1.2.3 From 961a39eb3dcaf4bfe542cd9336c9a73f087a371a Mon Sep 17 00:00:00 2001 From: sariel Date: Mon, 1 Nov 2021 16:52:32 +0200 Subject: Add .gitignore --- sd-plugin/.gitignore | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 sd-plugin/.gitignore diff --git a/sd-plugin/.gitignore b/sd-plugin/.gitignore new file mode 100644 index 00000000000..fa33885331d --- /dev/null +++ b/sd-plugin/.gitignore @@ -0,0 +1,15 @@ +.gradle +**/build/ +!src/**/build/ + +# ignore generated files +src/main/gen/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle/wrapper/gradle-wrapper.jar + +# Cache of project +.gradletasknamecache \ No newline at end of file -- cgit v1.2.3 From 40fd579a416b6756bbb2bf0d9bca74fc3d28568b Mon Sep 17 00:00:00 2001 From: sariel Date: Mon, 1 Nov 2021 16:53:20 +0200 Subject: Remove from plugin.xml (because version is injected from build.gradle) --- sd-plugin/src/main/resources/META-INF/plugin.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/sd-plugin/src/main/resources/META-INF/plugin.xml b/sd-plugin/src/main/resources/META-INF/plugin.xml index 10a617fe3d4..dd268bec16f 100644 --- a/sd-plugin/src/main/resources/META-INF/plugin.xml +++ b/sd-plugin/src/main/resources/META-INF/plugin.xml @@ -2,7 +2,6 @@ org.intellij.sdk.language SdReader - 1.0.0 Yahoo -- cgit v1.2.3 From 0d8dd535f755f6751f1b94ec3b6dfe1fe6c59846 Mon Sep 17 00:00:00 2001 From: sariel Date: Mon, 1 Nov 2021 16:54:01 +0200 Subject: Minor fix in FieldTypeName rule --- sd-plugin/src/main/java/org/intellij/sdk/language/parser/sd.bnf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/parser/sd.bnf b/sd-plugin/src/main/java/org/intellij/sdk/language/parser/sd.bnf index 6ae9d26729c..c8c7af8ade8 100644 --- a/sd-plugin/src/main/java/org/intellij/sdk/language/parser/sd.bnf +++ b/sd-plugin/src/main/java/org/intellij/sdk/language/parser/sd.bnf @@ -52,8 +52,8 @@ SchemaFieldDefinition ::= field IdentifierVal type FieldTypeName '{' SchemaField implements=["org.intellij.sdk.language.psi.SdDeclaration" "org.intellij.sdk.language.psi.SdNamedElement"] } -FieldTypeName ::= "array" '<' (FieldTypeName | IdentifierVal) '>' | "weightedset" '<' SingleValueFieldTypeName '>'| - "map" '<' (FieldTypeName | IdentifierVal) ',' (FieldTypeName | IdentifierVal) '>' | TensorType | +FieldTypeName ::= ("array" '<' (FieldTypeName | IdentifierVal) '>') | ("weightedset" '<' SingleValueFieldTypeName '>') | + ("map" '<' (FieldTypeName | IdentifierVal) ',' (FieldTypeName | IdentifierVal) '>') | TensorType | SingleValueFieldTypeName private SingleValueFieldTypeName ::= "string" | "int" | "long" | "bool" | "byte" | "float" | "double" | "position" | "predicate" | "raw" | "uri" | "reference" '<' IdentifierVal '>' | "annotationreference" '<' IdentifierVal '>' | IdentifierVal -- cgit v1.2.3