Sketch fluid plugin and clean up multi build

Author: cedricziel

.travis.yml

@@ -16,16 +16,19 @@ 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-2017.3.6" PHP_PLUGIN_VERSION="173.4674.46" PSI_VIEWER_PLUGIN_VERSION="3.28.93" SINCE_BUILD="173" UNTIL_BUILD="173.*"
+  - 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 +38,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

@@ -1,5 +1,4 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.jetbrains.grammarkit.tasks.*
 
 buildscript {
     repositories {
@@ -18,155 +17,67 @@ buildscript {
 
 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"
 }
 
+def details = versionDetails()
+
 group 'com.cedricziel.idea'
-version gitVersion()
 
 allprojects {
-    apply plugin: 'idea'
-    apply plugin: 'org.jetbrains.grammarkit'
-    apply plugin: 'org.jetbrains.intellij'
     apply plugin: 'java'
+    sourceCompatibility = javaVersion
+    targetCompatibility = javaTargetVersion
+    tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
 
-    repositories {
-        mavenCentral()
+    if (details.isCleanTag) {
+        version = "${details.lastTag}.$customSinceBuild"
+    } else {
+        version = "${details.lastTag}.$customSinceBuild-${details.gitHash}-SNAPSHOT"
     }
 
     intellij {
         version ideaVersion
-        downloadSources !Boolean.valueOf(System.getenv('CI'))
-
-        publishPlugin {
-            username System.getenv('IJ_REPO_USERNAME')
-            password System.getenv('IJ_REPO_PASSWORD')
-        }
-
-        patchPluginXml {
-            sinceBuild '173'
-            untilBuild '182.*'
-        }
+        updateSinceUntilBuild true
     }
 
-    grammarKit {
-        grammarKitRelease = "2017.1.4"
-        jflexRelease = '1.7.0-1'
-    }
-}
-
-project(":") {
-    intellij {
-        pluginName 'TYPO3 CMS Plugin'
-        plugins = [
-            "com.jetbrains.php:${phpPluginVersion}",
-            'CSS',
-            'java-i18n',
-            'properties',
-            'yaml',
-            "PsiViewer:${psiViewerPluginVersion}",
-            project('lang-fluid'),
-            project('lang-typoscript'),
-        ]
-    }
-}
-
-project(":lang-fluid") {
-    def genRoot = file('gen')
-    sourceSets {
-        main {
-            java.srcDirs 'src', genRoot
-            resources.srcDir 'resources'
-        }
-        test {
-            java.srcDir 'test'
-            resources.srcDirs 'testData'
+    patchPluginXml {
+        if (customSinceBuild) {
+            sinceBuild customSinceBuild
         }
-    }
-
-    idea {
-        module {
-            generatedSourceDirs += genRoot
+        if (customUntilBuild) {
+            untilBuild customUntilBuild
         }
     }
-
-    intellij {
-        pluginName 'TYPO3 Fluid Plugin'
-        plugins = [
-            "com.jetbrains.php:${phpPluginVersion}",
-            'CSS',
-            'java-i18n',
-            'properties',
-            'yaml',
-            "PsiViewer:${psiViewerPluginVersion}"
-        ]
-    }
-
-    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
-    }
 }
 
-project(":lang-typoscript") {
-    def genRoot = file('gen')
-    sourceSets {
-        main {
-            java.srcDirs 'src', genRoot
-            resources.srcDir 'resources'
-        }
-        test {
-            java.srcDir 'test'
-            resources.srcDirs 'testData'
-        }
-    }
+subprojects {
+    apply plugin: 'idea'
+    apply plugin: 'org.jetbrains.grammarkit'
+    apply plugin: 'org.jetbrains.intellij'
+    apply plugin: 'java'
 
-    idea {
-        module {
-            generatedSourceDirs += genRoot
-        }
+    repositories {
+        mavenCentral()
     }
 
     intellij {
-        pluginName 'TypoScript Plugin'
-        plugins = [
-            "com.jetbrains.php:${phpPluginVersion}",
-            'CSS',
-            'java-i18n',
-            'properties',
-            'yaml',
-            "PsiViewer:${psiViewerPluginVersion}"
-        ]
+        version ideaVersion
+        downloadSources !Boolean.valueOf(System.getenv('CI'))
+        sameSinceUntilBuild Boolean.valueOf(isEAP)
     }
 
-    task generateTypoScriptLexer(type: GenerateLexer) {
-        source = "src/main/grammars/TypoScriptLexer.flex"
-        targetDir = "gen/com/cedricziel/idea/typoscript/lang/lexer"
-        targetClass = "TypoScriptLexer"
+    publishPlugin {
+        username System.getenv('IJ_REPO_USERNAME')
+        password System.getenv('IJ_REPO_PASSWORD')
     }
 
-    task generateTypoScriptParser(type: GenerateParser) {
-        source = "src/main/grammars/TypoScriptParser.bnf"
-        targetRoot = 'gen'
-        pathToParser = '/com/cedricziel/idea/typoscript/lang/parser/TypoScriptParserGenerated.java'
-        pathToPsiRoot = '/com/cedricziel/idea/typoscript/lang/psi'
+    grammarKit {
+        grammarKitRelease = "2017.1.4"
+        jflexRelease = '1.7.0-1'
     }
 
-    compileJava {
-        dependsOn generateTypoScriptParser, generateTypoScriptLexer
-    }
+    test.testLogging.exceptionFormat = TestExceptionFormat.FULL
 }
 
 wrapper {

gradle.properties

@@ -1,8 +1,19 @@
+javaVersion = 1.8
+javaTargetVersion = 1.8
+
+buildNumber = SNAPSHOT
+isEAP = false
+customSinceBuild = 182
+customUntilBuild = 182.*
+
 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
+
+#ideaVersion = IU-2017.3.6
+#phpPluginVersion = 173.4674.46
+#psiViewerPluginVersion = 3.28.93

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