Merge pull request #199 from cedricziel/multi-build

Add multi module build for more..plugins

Author: cedricziel

.editorconfig

@@ -0,0 +1,19 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.bnf]
+indent_size = 2

.travis.yml

@@ -16,16 +16,18 @@ cache:
 
 matrix:
   include:
-  - env: IDEA_VERSION="IU-182.3341.11" PHP_PLUGIN_VERSION="182.3341.34" PSI_VIEWER_PLUGIN_VERSION=182.2757.2 DEPLOY=true
-#  - env: IDEA_VERSION="IU-173.4127.17" PHP_PLUGIN_VERSION="173.4127.13"
-#  allow_failures:
-#  - env: IDEA_VERSION="IU-173.4127.17" PHP_PLUGIN_VERSION="173.4127.13"
+  - env: IDEA_VERSION="IU-2018.1.5" PHP_PLUGIN_VERSION="181.5281.35" PSI_VIEWER_PLUGIN_VERSION="2018.1.2" SINCE_BUILD="181" UNTIL_BUILD="181.*"
+  - env: IDEA_VERSION="IU-182.3341.11" PHP_PLUGIN_VERSION="182.3341.34" PSI_VIEWER_PLUGIN_VERSION="182.2757.2" SINCE_BUILD="182" UNTIL_BUILD="182.*"
+  allow_failures:
+  - env: IDEA_VERSION="IU-182.3341.11" PHP_PLUGIN_VERSION="182.3341.34" PSI_VIEWER_PLUGIN_VERSION=182.2757.2 SINCE_BUILD="182" UNTIL_BUILD="182.*"
 
 before_install:
 - "export ORG_GRADLE_PROJECT_ideaVersion=${IDEA_VERSION}"
 - "export ORG_GRADLE_PROJECT_ideaType=${IDEA_TYPE}"
 - "export ORG_GRADLE_PROJECT_phpPluginVersion=${PHP_PLUGIN_VERSION}"
 - "export ORG_GRADLE_PROJECT_psiViewerPluginVersion=${PSI_VIEWER_PLUGIN_VERSION}"
+- "export ORG_GRADLE_PROJECT_customSinceBuild=${SINCE_BUILD}"
+- "export ORG_GRADLE_PROJECT_customUntilBuild=${UNTIL_BUILD}"
 - java -version
 
 script:
@@ -35,12 +37,15 @@ script:
 deploy:
   provider: releases
   api_key: "${GITHUB_KEY}"
-  file: build/distributions/TYPO3*.zip
+  file:
+    - lang-fluid/build/distributions/TYPO3*.zip
+    - lang-typoscript/build/distributions/TYPO3*.zip
+    - typo3-cms/build/distributions/TYPO3*.zip
   skip_cleanup: true
   file_glob: true
   on:
     tags: true
     condition: "$TRAVIS_TAG =~ ^v[0-9]+.*$"
 
 after_deploy:
-- "./gradlew publishPlugin"
+- "./gradlew :typo3-cms:publishPlugin"

build.gradle

@@ -4,45 +4,81 @@ buildscript {
     repositories {
         mavenCentral()
 
+        maven { url "https://jetbrains.bintray.com/intellij-third-party-dependencies" }
+
+        maven { url 'https://jitpack.io' }
         maven { url 'http://dl.bintray.com/jetbrains/intellij-plugin-service' }
     }
+
+    dependencies {
+        classpath "com.github.JetBrains:gradle-grammar-kit-plugin:${grammarKitPluginVersion}"
+    }
 }
 
 plugins {
     id "org.jetbrains.intellij" version "0.3.4"
-    id 'com.palantir.git-version' version "0.9.1"
+    id 'com.palantir.git-version' version "0.11.0"
 }
 
-apply plugin: 'idea'
-apply plugin: 'org.jetbrains.intellij'
-apply plugin: 'java'
-
-intellij {
-    version ideaVersion
-    pluginName 'TYPO3 CMS Plugin'
-    plugins = [
-            "com.jetbrains.php:${phpPluginVersion}",
-            'CSS',
-            'java-i18n',
-            'properties',
-            'yaml',
-            "PsiViewer:${psiViewerPluginVersion}"
-    ]
-    downloadSources !Boolean.valueOf(System.getenv('CI'))
+def details = versionDetails()
+
+group 'com.cedricziel.idea'
+
+allprojects {
+    apply plugin: 'java'
+    sourceCompatibility = javaVersion
+    targetCompatibility = javaTargetVersion
+    tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
+
+    if (details.isCleanTag) {
+        version = "${details.lastTag}.$customSinceBuild"
+    } else {
+        version = "${details.lastTag}.$customSinceBuild.${details.gitHash}-SNAPSHOT"
+    }
+
+    intellij {
+        version ideaVersion
+        updateSinceUntilBuild true
+    }
+
+    patchPluginXml {
+        if (customSinceBuild) {
+            sinceBuild customSinceBuild
+        }
+        if (customUntilBuild) {
+            untilBuild customUntilBuild
+        }
+    }
+}
+
+subprojects {
+    apply plugin: 'idea'
+    apply plugin: 'org.jetbrains.grammarkit'
+    apply plugin: 'org.jetbrains.intellij'
+    apply plugin: 'java'
+
+    repositories {
+        mavenCentral()
+    }
+
+    intellij {
+        version ideaVersion
+        downloadSources !Boolean.valueOf(System.getenv('CI'))
+        sameSinceUntilBuild Boolean.valueOf(isEAP)
+    }
 
     publishPlugin {
         username System.getenv('IJ_REPO_USERNAME')
         password System.getenv('IJ_REPO_PASSWORD')
     }
 
-    patchPluginXml {
-        sinceBuild '173'
-        untilBuild '182.*'
+    grammarKit {
+        grammarKitRelease = "2017.1.4"
+        jflexRelease = jFlexRelease
     }
-}
 
-group 'com.cedricziel'
-version gitVersion()
+    test.testLogging.exceptionFormat = TestExceptionFormat.FULL
+}
 
 wrapper {
     gradleVersion '4.8'

gradle.properties

@@ -1,8 +1,18 @@
+javaVersion = 1.8
+javaTargetVersion = 1.8
+
+buildNumber = SNAPSHOT
+isEAP = false
+customSinceBuild = 182
+customUntilBuild = 182.*
+
+jFlexRelease = 1.7.0-1
+grammarKitPluginVersion = 2018.1.3
+
 ideaVersion = IU-182.3341.11
 phpPluginVersion = 182.3341.34
 psiViewerPluginVersion = 182.2757.2
 
-#ideaVersion = IU-2018.1.4
-#phpPluginVersion = 181.5087.24
-#ideaVersion = IU-2017.3.3
-#phpPluginVersion = 173.4301.34
+#ideaVersion = IU-2018.1.5
+#phpPluginVersion = 181.5281.35
+#psiViewerPluginVersion = 2018.1.2

lang-fluid/.gitignore

@@ -0,0 +1,2 @@
+build
+gen

lang-fluid/build.gradle

@@ -0,0 +1,74 @@
+buildscript {
+    repositories {
+        mavenCentral()
+
+        maven { url "https://jetbrains.bintray.com/intellij-third-party-dependencies" }
+
+        maven { url 'https://jitpack.io' }
+        maven { url 'http://dl.bintray.com/jetbrains/intellij-plugin-service' }
+    }
+
+    dependencies {
+        classpath "com.github.JetBrains:gradle-grammar-kit-plugin:2018.1.2"
+    }
+}
+
+import org.jetbrains.grammarkit.tasks.GenerateLexer
+import org.jetbrains.grammarkit.tasks.GenerateParser
+
+def genRoot = file('gen')
+sourceSets {
+    main {
+        java.srcDirs += genRoot
+        resources.srcDir 'resources'
+    }
+    test {
+        java.srcDir 'test'
+        resources.srcDirs 'testData'
+    }
+}
+
+idea {
+    module {
+        generatedSourceDirs += genRoot
+    }
+}
+
+intellij {
+    version ideaVersion
+    pluginName 'TYPO3 Fluid Plugin'
+    plugins = [
+        "com.jetbrains.php:${phpPluginVersion}",
+        'uml',
+        'CSS',
+        'java-i18n',
+        'properties',
+        'yaml',
+        "PsiViewer:${psiViewerPluginVersion}"
+    ]
+}
+
+publishPlugin {
+    channels 'nightly'
+}
+
+task generateFluidLexer(type: GenerateLexer) {
+    source = "src/main/grammars/FluidLexer.flex"
+    targetDir = "gen/com/cedricziel/idea/fluid/lang/lexer"
+    targetClass = "_FluidLexer"
+}
+
+task generateFluidParser(type: GenerateParser) {
+    source = "src/main/grammars/FluidParser.bnf"
+    targetRoot = 'gen'
+    pathToParser = '/com/cedricziel/idea/fluid/lang/parser/FluidParserGenerated.java'
+    pathToPsiRoot = '/com/cedricziel/idea/fluid/lang/psi'
+}
+
+compileJava {
+    dependsOn generateFluidParser, generateFluidLexer
+}
+
+clean.doLast {
+    file('gen').deleteDir()
+}

lang-fluid/src/README.md

@@ -0,0 +1,29 @@
+# TYPO3 Fluid plugin for IntelliJ based IDEs
+
+This plugin is in an early draft stage. The project aims to  provide
+a fully OpenSource plugin for the Fluid Template Language.
+
+## Thoughts
+
+In no particular order, these are measures we can implement to make sure,
+the language integrates nicely in the context. What's needed, is both
+an integration into the HTML Language (which is XML, internally), and
+a template language that resembles the inline syntax.
+
+* use TemplateLanguage to be able to embed the fluid inside any outer template
+* use XmlAttributeDescriptorsProvider (https://github.com/JetBrains/intellij-plugins/blob/master/AngularJS/src/org/angularjs/codeInsight/attributes/AngularJSAttributeDescriptorsProvider.java)
+  to provide valid XML attributes
+* use HtmlXmlExtension to fix XML Validation errors (https://github.com/JetBrains/intellij-plugins/blob/master/AngularJS/src/org/angularjs/codeInsight/AngularJSHtmlExtension.java)
+  this should be used to implicitly provide namespaces (such as f, which is always available)
+* IntentionAndInspectionFilter to filter external inspections on a element
+  (https://github.com/JetBrains/intellij-plugins/blob/master/AngularJS/src/org/angularjs/codeInsight/AngularJSInspectionFilter.java)
+* provide tags and element descriptors
+  https://github.com/JetBrains/intellij-plugins/blob/master/AngularJS/src/org/angularjs/codeInsight/tags/AngularJSTagDescriptorsProvider.java
+* Extend XMLLanguage and replace if applicable? https://github.com/JetBrains/intellij-plugins/blob/master/AngularJS/src/org/angularjs/html/Angular2HTMLLanguage.java
+* add PostfixTemplateProvider for easier loops
+* add LiveTemplateProvider
+* allow Injection of other languages through `AbstractLanguageInjectionSupport`
+
+## License
+
+MIT

lang-fluid/src/main/grammars/FluidLexer.flex

@@ -0,0 +1,79 @@
+package com.cedricziel.idea.fluid.lang.lexer;
+
+import com.intellij.lexer.FlexLexer;
+
+import com.intellij.psi.TokenType;
+import com.intellij.psi.tree.IElementType;
+
+import com.cedricziel.idea.fluid.lang.psi.FluidTypes;
+
+%%
+
+%{
+  public _FluidLexer() {
+    this((java.io.Reader) null);
+  }
+%}
+
+%class _FluidLexer
+%implements FlexLexer
+%function advance
+%type IElementType
+%unicode
+
+WS = \s
+
+INTEGER_NUMBER = 0|[1-9]\d*
+FLOAT_NUMBER = [0-9]*\.[0-9]+([eE][-+]?[0-9]+)?|[0-9]+[eE][-+]?[0-9]+
+IDENTIFIER = [\p{Alpha}_][\p{Alnum}_:]*
+
+%state EXPRESSION
+%state SINGLE_QUOTED_STRING
+%state DOUBLE_QUOTED_STRING
+%state TERNARY_BRANCHES_OP
+%state COMMENT
+
+%%
+
+<YYINITIAL> {
+  "{"                         { yybegin(EXPRESSION); return FluidTypes.EXPR_START; }
+  "<!--/*"                    { yybegin(COMMENT); return FluidTypes.COMMENT_START; }
+  "}"                         { yybegin(YYINITIAL); return FluidTypes.EXPR_END; }
+
+  "true"                      { return FluidTypes.BOOLEAN_LITERAL; }
+  "false"                     { return FluidTypes.BOOLEAN_LITERAL; }
+  "TRUE"                      { return FluidTypes.BOOLEAN_LITERAL; }
+  "FALSE"                     { return FluidTypes.BOOLEAN_LITERAL; }
+
+  "'"                         { yybegin(SINGLE_QUOTED_STRING); return FluidTypes.SINGLE_QUOTE; }
+  \"                          { yybegin(DOUBLE_QUOTED_STRING); return FluidTypes.DOUBLE_QUOTE; }
+  {INTEGER_NUMBER}            { return FluidTypes.INTEGER_NUMBER; }
+  {FLOAT_NUMBER}              { return FluidTypes.FLOAT_NUMBER; }
+  {IDENTIFIER}                { return FluidTypes.IDENTIFIER; }
+
+  "("                         { return FluidTypes.LEFT_PARENTH; }
+  ")"                         { return FluidTypes.RIGHT_PARENTH; }
+  "."                         { return FluidTypes.DOT; }
+  ","                         { return FluidTypes.COMMA; }
+  "!"                         { return FluidTypes.NOT; }
+  "&&"                        { return FluidTypes.AND; }
+  "||"                        { return FluidTypes.OR; }
+
+  "="                         { return FluidTypes.ASSIGN; }
+  "=="                        { return FluidTypes.EQ; }
+  "!="                        { return FluidTypes.NEQ; }
+  "<"                         { return FluidTypes.LT; }
+  ">"                         { return FluidTypes.GT; }
+  "<="                        { return FluidTypes.LEQ; }
+  ">="                        { return FluidTypes.GEQ; }
+  "?"                         { return FluidTypes.TERNARY_QUESTION_OP; }
+
+  {WS}+                       { return TokenType.WHITE_SPACE; }
+
+  [^]                         { yybegin(YYINITIAL); return TokenType.BAD_CHARACTER; }
+}
+
+<COMMENT> {
+  "*/-->"                     { yybegin(YYINITIAL); return FluidTypes.COMMENT_END; }
+  [^]                         { return FluidTypes.COMMENT_CONTENT; }
+}