Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2015-12-02 00:42:18 +0000
committerTom Schindl2015-12-02 01:21:13 +0000
commit8af075e8d3617b8022cb8c98b3d767218f234d2e (patch)
treee71586709cb9bcb9dd5672184dd32d1924dcfa1b
parent8f3f5bfd60abd31461d97fbbc9091ec066f74255 (diff)
downloadorg.eclipse.efxclipse-8af075e8d3617b8022cb8c98b3d767218f234d2e.tar.gz
org.eclipse.efxclipse-8af075e8d3617b8022cb8c98b3d767218f234d2e.tar.xz
org.eclipse.efxclipse-8af075e8d3617b8022cb8c98b3d767218f234d2e.zip
Bug 483038 - Allow to configures editor highlightings based on JSON
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/META-INF/MANIFEST.MF1
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text/OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.internal.ConfigurationModelCF.xml2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/internal/ConfigurationModelCF.java2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/.classpath (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/.classpath)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/.gitignore (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/.gitignore)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/.project (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/.project)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/.settings/org.eclipse.jdt.core.prefs (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/META-INF/MANIFEST.MF24
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/build.properties4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/pom.xml (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.text/pom.xml)6
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/AdocPartitionScanner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/AdocPartitionScanner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/AdocPartitioner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/AdocPartitioner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/AdocPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/AdocPresentationReconciler.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__adoc_literal_block.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__adoc_literal_block.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__adoc_multiline_code.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__adoc_multiline_code.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__adoc_multiline_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__adoc_multiline_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__adoc_singleline_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__adoc_singleline_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__dftl_partition_content_type.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__dftl_partition_content_type.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/CeylonPartitionScanner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/CeylonPartitionScanner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/CeylonPartitioner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/CeylonPartitioner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/CeylonPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/CeylonPresentationReconciler.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__ceylon_multi_line_api_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__ceylon_multi_line_api_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__ceylon_multi_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__ceylon_multi_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__ceylon_single_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__ceylon_single_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__ceylon_string.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__ceylon_string.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__dftl_partition_content_type.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__dftl_partition_content_type.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/DartPartitionScanner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/DartPartitionScanner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/DartPartitioner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/DartPartitioner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/DartPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/DartPresentationReconciler.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_multiline_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_multiline_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_multilinedoc_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_multilinedoc_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_singleline_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_singleline_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_singlelinedoc_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_singlelinedoc_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_string.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_string.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dftl_partition_content_type.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dftl_partition_content_type.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/GoPartitionScanner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/GoPartitionScanner.java)6
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/GoPartitioner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/GoPartitioner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/GoPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/GoPresentationReconciler.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/Go__dftl_partition_content_type.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/Go__dftl_partition_content_type.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/Go__go_multi_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/Go__go_multi_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/Go__go_single_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/Go__go_single_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/Go__go_string.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/Go__go_string.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/GroovyPartitionScanner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/GroovyPartitionScanner.java)6
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/GroovyPartitioner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/GroovyPartitioner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/GroovyPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/GroovyPresentationReconciler.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__dftl_partition_content_type.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__dftl_partition_content_type.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_apidoc.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_apidoc.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_character.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_character.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_multiline_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_multiline_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_singleline_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_singleline_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_string.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_string.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/JavaPartitionScanner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/JavaPartitionScanner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/JavaPartitioner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/JavaPartitioner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/JavaPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/JavaPresentationReconciler.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__dftl_partition_content_type.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__dftl_partition_content_type.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__java_multi_line_api_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__java_multi_line_api_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__java_multi_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__java_multi_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__java_single_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__java_single_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__java_string.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__java_string.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/JsPartitionScanner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/JsPartitionScanner.java)6
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/JsPartitioner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/JsPartitioner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/JsPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/JsPresentationReconciler.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/Js__dftl_partition_content_type.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/Js__dftl_partition_content_type.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/Js__js_multi_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/Js__js_multi_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/Js__js_single_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/Js__js_single_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/Js__js_string.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/Js__js_string.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/KotlinPartitionScanner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/KotlinPartitionScanner.java)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/KotlinPartitioner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/KotlinPartitioner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/KotlinPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/KotlinPresentationReconciler.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__dftl_partition_content_type.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__dftl_partition_content_type.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__kotlin_multi_line_api_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__kotlin_multi_line_api_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__kotlin_multi_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__kotlin_multi_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__kotlin_single_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__kotlin_single_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__kotlin_string.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__kotlin_string.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/LuaPartitionScanner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/LuaPartitionScanner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/LuaPartitioner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/LuaPartitioner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/LuaPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/LuaPresentationReconciler.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/Lua__dftl_partition_content_type.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/Lua__dftl_partition_content_type.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/Lua__lua_multi_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/Lua__lua_multi_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/Lua__lua_single_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/Lua__lua_single_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/Lua__lua_string.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/Lua__lua_string.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/PhpPartitionScanner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/PhpPartitionScanner.java)6
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/PhpPartitioner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/PhpPartitioner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/PhpPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/PhpPresentationReconciler.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/Php__dftl_partition_content_type.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/Php__dftl_partition_content_type.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/Php__php_multiline_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/Php__php_multiline_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/Php__php_string.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/Php__php_string.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/PyPartitionScanner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/PyPartitionScanner.java)6
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/PyPartitioner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/PyPartitioner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/PyPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/PyPresentationReconciler.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/Py__dftl_partition_content_type.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/Py__dftl_partition_content_type.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/Py__python_multiline_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/Py__python_multiline_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/Py__python_singleline_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/Py__python_singleline_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/Py__python_string.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/Py__python_string.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/RustPartitionScanner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/RustPartitionScanner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/RustPartitioner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/RustPartitioner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/RustPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/RustPresentationReconciler.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/Rust__dftl_partition_content_type.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/Rust__dftl_partition_content_type.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/Rust__rust_multi_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/Rust__rust_multi_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/Rust__rust_single_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/Rust__rust_single_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/Rust__rust_string.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/Rust__rust_string.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/SwiftPartitionScanner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/SwiftPartitionScanner.java)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/SwiftPartitioner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/SwiftPartitioner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/SwiftPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/SwiftPresentationReconciler.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/Swift__dftl_partition_content_type.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/Swift__dftl_partition_content_type.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/Swift__swift_multi_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/Swift__swift_multi_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/Swift__swift_single_line_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/Swift__swift_single_line_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/Swift__swift_string.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/Swift__swift_string.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/XmlPartitionScanner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/XmlPartitionScanner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/XmlPartitioner.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/XmlPartitioner.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/XmlPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/XmlPresentationReconciler.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__dftl_partition_content_type.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__dftl_partition_content_type.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_cdata.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_cdata.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_comment.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_comment.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_decl.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_decl.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_pi.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_pi.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_tag.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_tag.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.contrib/.classpath (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.classpath)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.contrib/.gitignore (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.gitignore)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.contrib/.project (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.text/.project)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.contrib/.settings/ca.ecliptical.pde.ds.prefs5
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.contrib/.settings/org.eclipse.jdt.core.prefs (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.contrib/META-INF/MANIFEST.MF13
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.contrib/OSGI-INF/services/org.eclipse.fx.code.editor.langs.contrib.LangsConfigurationModelProvider.xml7
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.contrib/build.properties (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/build.properties)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.contrib/pom.xml (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/pom.xml)6
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.contrib/src/org/eclipse/fx/code/editor/langs/contrib/LangsConfigurationModelProvider.java87
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.themes/.classpath (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.classpath)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.themes/.gitignore (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.gitignore)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.themes/.project (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.project)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.themes/.settings/ca.ecliptical.pde.ds.prefs5
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.themes/.settings/org.eclipse.jdt.core.prefs (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.themes/META-INF/MANIFEST.MF11
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.themes/OSGI-INF/services/org.eclipse.fx.code.editor.langs.themes.DefaultEditorStylesheets.xml (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.langs.themes.DefaultEditorStylesheets.xml)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.themes/build.properties (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/build.properties)5
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.themes/pom.xml (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/pom.xml)6
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs.themes/src/org/eclipse/fx/code/editor/langs/themes/DefaultEditorStylesheets.java (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/src/org/eclipse/fx/code/editor/ldef/langs/themes/DefaultEditorStylesheets.java)30
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/.classpath1
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/build.properties3
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/adoc.json454
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/ceylon.json182
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/dart.json320
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/gls.json80
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/go.json199
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/groovy.json209
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/java.json253
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/js.json170
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/kotlin.json181
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/lua.json92
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/php.json264
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/py.json176
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/rust.json222
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/swift.json217
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/xml.json170
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/adoc.css (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/asciidoc/highlight.css)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/adoc.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/asciidoc/asciidoc.ldef)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/ceylon.css (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/ceylon/highlight.css)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/ceylon.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/ceylon/ceylon.ldef)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/dart.css (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/dart/highlight.css)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/dart.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/dart/dart.ldef)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/gls.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/gls/gls.ldef)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/go.css (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/go/highlight.css)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/go.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/go/go.ldef)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/groovy.css (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/groovy/highlight.css)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/groovy.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/groovy/groovy.ldef)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/java.css (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/java/highlight.css)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/java.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/java/java.ldef)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/js.css (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/js/highlight.css)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/js.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/js/js.ldef)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/kotlin.css (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/kotlin/highlight.css)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/kotlin.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/kotlin/kotlin.ldef)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/lua.css (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/lua/highlight.css)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/lua.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/lua/lua.ldef)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/php.css (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/php/highlight.css)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/php.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/php/php.ldef)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/python.css (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/python/highlight.css)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/python.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/python/python.ldef)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/rust.css (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/rust/highlight.css)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/rust.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/rust/rust.ldef)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/swift.css (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/swift/highlight.css)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/swift.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/swift/swift.ldef)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/xml.css (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/xml/highlight.css)0
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/xml.ldef (renamed from bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/xml/xml.ldef)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/META-INF/MANIFEST.MF26
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/about.html28
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.settings/ca.ecliptical.pde.ds.prefs4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/META-INF/MANIFEST.MF18
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.langs.text.LDefDefaultModelProvider.xml8
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/about.html28
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/pom.xml34
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/src/org/eclipse/fx/code/editor/ldef/langs/text/LDefDefaultModelProvider.java86
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.project33
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.settings/ca.ecliptical.pde.ds.prefs4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/META-INF/MANIFEST.MF12
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/about.html28
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/build.properties6
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/pom.xml34
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.langs/bin/.project (renamed from bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.project)8
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.classpath7
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.gitignore2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.settings/ca.ecliptical.pde.ds.prefs4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/META-INF/MANIFEST.MF21
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.fx.LDefPresentationReconcilerTypeProvider.xml8
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/about.html28
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/build.properties6
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/src/org/eclipse/fx/code/editor/ldef/text/fx/LDefPresentationReconcilerTypeProvider.java34
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/src/org/eclipse/fx/code/editor/ldef/text/fx/internal/LDefPresentationReconciler.java25
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/src/org/eclipse/fx/code/editor/ldef/text/fx/internal/LDefRuleScanner.java174
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/.classpath7
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/.gitignore2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/.settings/ca.ecliptical.pde.ds.prefs4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/META-INF/MANIFEST.MF23
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.internal.LDefDocumentPartitionerProvider.xml8
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.internal.LDefModelCF.xml9
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/about.html28
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/build.properties6
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/LDefModelProvider.java9
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/LDefPartitioner.java35
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/ModelDependentTypeProvider.java29
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/Util.java50
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/internal/LDefDocumentPartitionerProvider.java35
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/internal/LDefModelCF.java49
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/internal/LDefRuleBasedPartitionScanner.java49
-rwxr-xr-xreleng/org.eclipse.fx.ide.releng/pom.xml2
226 files changed, 3539 insertions, 1199 deletions
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/META-INF/MANIFEST.MF
index 05453bb22..21557e4f0 100644
--- a/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/META-INF/MANIFEST.MF
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@ Import-Package: javax.inject;version="1.0.0",
org.osgi.service.component.annotations
Service-Component: OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.fx.ConfigurationPresentationReconcilerTypeProvider.xml
Require-Bundle: org.eclipse.text;bundle-version="3.5.400"
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text/OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.internal.ConfigurationModelCF.xml b/bundles/code/org.eclipse.fx.code.editor.configuration.text/OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.internal.ConfigurationModelCF.xml
index 3d0854131..911c1d14d 100644
--- a/bundles/code/org.eclipse.fx.code.editor.configuration.text/OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.internal.ConfigurationModelCF.xml
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text/OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.internal.ConfigurationModelCF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0" name="org.eclipse.fx.code.editor.configuration.text.internal.ConfigurationModelCF">
- <property name="service.context.key" value="org.eclipse.fx.code.editor.configuration.LanguageDe"/>
+ <property name="service.context.key" value="org.eclipse.fx.code.editor.configuration.LanguageDef"/>
<service>
<provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
</service>
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/internal/ConfigurationModelCF.java b/bundles/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/internal/ConfigurationModelCF.java
index 911231ba5..9024a3501 100644
--- a/bundles/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/internal/ConfigurationModelCF.java
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/internal/ConfigurationModelCF.java
@@ -15,7 +15,7 @@ import org.osgi.service.component.annotations.ReferencePolicy;
import org.osgi.service.component.annotations.ReferencePolicyOption;
@SuppressWarnings("restriction")
-@Component(service=IContextFunction.class,property={"service.context.key=org.eclipse.fx.code.editor.configuration.LanguageDe"})
+@Component(service=IContextFunction.class,property={"service.context.key=org.eclipse.fx.code.editor.configuration.LanguageDef"})
public class ConfigurationModelCF extends ContextFunction {
private List<ConfigurationModelProvider> providerList = new ArrayList<>();
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/.classpath b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/.classpath
index eca7bdba8..eca7bdba8 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/.classpath
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/.classpath
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/.gitignore b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/.gitignore
index 09e3bc9b2..09e3bc9b2 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/.gitignore
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/.gitignore
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/.project b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/.project
index d9bd6989a..f8e53ecb7 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/.project
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.fx.code.editor.ldef.langs.fx</name>
+ <name>org.eclipse.fx.code.editor.langs.codegen.fx</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/.settings/org.eclipse.jdt.core.prefs b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dc..0c68a61dc 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..f14aaff23
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/META-INF/MANIFEST.MF
@@ -0,0 +1,24 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Fx
+Bundle-SymbolicName: org.eclipse.fx.code.editor.langs.codegen.fx
+Bundle-Version: 2.2.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.fx.text;bundle-version="2.2.0",
+ org.eclipse.fx.text.ui;bundle-version="2.2.0",
+ org.eclipse.fx.text.compat;bundle-version="2.2.0",
+ org.eclipse.text;bundle-version="3.5.400"
+Export-Package: org.eclipse.fx.code.editor.langs.codegen.fx.asciidoc;x-internal:=true,
+ org.eclipse.fx.code.editor.langs.codegen.fx.ceylon;x-internal:=true,
+ org.eclipse.fx.code.editor.langs.codegen.fx.dart;x-internal:=true,
+ org.eclipse.fx.code.editor.langs.codegen.fx.go;x-internal:=true,
+ org.eclipse.fx.code.editor.langs.codegen.fx.groovy;x-internal:=true,
+ org.eclipse.fx.code.editor.langs.codegen.fx.java;x-internal:=true,
+ org.eclipse.fx.code.editor.langs.codegen.fx.js;x-internal:=true,
+ org.eclipse.fx.code.editor.langs.codegen.fx.kotlin;x-internal:=true,
+ org.eclipse.fx.code.editor.langs.codegen.fx.lua;x-internal:=true,
+ org.eclipse.fx.code.editor.langs.codegen.fx.php;x-internal:=true,
+ org.eclipse.fx.code.editor.langs.codegen.fx.python;x-internal:=true,
+ org.eclipse.fx.code.editor.langs.codegen.fx.rust;x-internal:=true,
+ org.eclipse.fx.code.editor.langs.codegen.fx.swift;x-internal:=true,
+ org.eclipse.fx.code.editor.langs.codegen.fx.xml;x-internal:=true
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/build.properties b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/build.properties
new file mode 100644
index 000000000..34d2e4d2d
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/pom.xml b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/pom.xml
index 987461f03..e0624a3dd 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/pom.xml
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/pom.xml
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>e(fx)clipse - Runtime - Code - LDef Text</name>
+ <name>e(fx)clipse - Runtime - Code - Generated Editor Code for JavaFX</name>
<groupId>org.eclipse.fx.runtime</groupId>
- <artifactId>org.eclipse.fx.code.editor.ldef.text</artifactId>
+ <artifactId>org.eclipse.fx.code.editor.langs.codegen.fx</artifactId>
<packaging>eclipse-plugin</packaging>
<parent>
@@ -31,4 +31,4 @@
</plugins>
</build>
-</project> \ No newline at end of file
+</project>
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/AdocPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/AdocPartitionScanner.java
index 81b6f9562..5c879eb93 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/AdocPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/AdocPartitionScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.asciidoc;
+package org.eclipse.fx.code.editor.langs.codegen.fx.asciidoc;
public class AdocPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPartitionScanner {
public AdocPartitionScanner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/AdocPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/AdocPartitioner.java
index fa8514af4..938cb3477 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/AdocPartitioner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/AdocPartitioner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.asciidoc;
+package org.eclipse.fx.code.editor.langs.codegen.fx.asciidoc;
public class AdocPartitioner extends org.eclipse.jface.text.rules.FastPartitioner {
public AdocPartitioner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/AdocPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/AdocPresentationReconciler.java
index b04c34d6a..58df00c91 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/AdocPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/AdocPresentationReconciler.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.asciidoc;
+package org.eclipse.fx.code.editor.langs.codegen.fx.asciidoc;
public class AdocPresentationReconciler extends org.eclipse.fx.text.ui.presentation.PresentationReconciler {
public AdocPresentationReconciler() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__adoc_literal_block.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__adoc_literal_block.java
index 2ad19e5a7..e8a9661f2 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__adoc_literal_block.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__adoc_literal_block.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.asciidoc;
+package org.eclipse.fx.code.editor.langs.codegen.fx.asciidoc;
public class Adoc__adoc_literal_block extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Adoc__adoc_literal_block() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__adoc_multiline_code.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__adoc_multiline_code.java
index b746b4f61..57eec054c 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__adoc_multiline_code.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__adoc_multiline_code.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.asciidoc;
+package org.eclipse.fx.code.editor.langs.codegen.fx.asciidoc;
public class Adoc__adoc_multiline_code extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Adoc__adoc_multiline_code() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__adoc_multiline_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__adoc_multiline_comment.java
index 27ba9b7c3..acb8661e0 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__adoc_multiline_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__adoc_multiline_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.asciidoc;
+package org.eclipse.fx.code.editor.langs.codegen.fx.asciidoc;
public class Adoc__adoc_multiline_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Adoc__adoc_multiline_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__adoc_singleline_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__adoc_singleline_comment.java
index 7da2dba2c..8b9688449 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__adoc_singleline_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__adoc_singleline_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.asciidoc;
+package org.eclipse.fx.code.editor.langs.codegen.fx.asciidoc;
public class Adoc__adoc_singleline_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Adoc__adoc_singleline_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__dftl_partition_content_type.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__dftl_partition_content_type.java
index d942d899c..2ca7b064f 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/asciidoc/Adoc__dftl_partition_content_type.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/asciidoc/Adoc__dftl_partition_content_type.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.asciidoc;
+package org.eclipse.fx.code.editor.langs.codegen.fx.asciidoc;
public class Adoc__dftl_partition_content_type extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Adoc__dftl_partition_content_type() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/CeylonPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/CeylonPartitionScanner.java
index 35745da6b..bc1d6b21c 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/CeylonPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/CeylonPartitionScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.ceylon;
+package org.eclipse.fx.code.editor.langs.codegen.fx.ceylon;
public class CeylonPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPartitionScanner {
public CeylonPartitionScanner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/CeylonPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/CeylonPartitioner.java
index b4d6a814c..57d944b80 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/CeylonPartitioner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/CeylonPartitioner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.ceylon;
+package org.eclipse.fx.code.editor.langs.codegen.fx.ceylon;
public class CeylonPartitioner extends org.eclipse.jface.text.rules.FastPartitioner {
public CeylonPartitioner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/CeylonPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/CeylonPresentationReconciler.java
index ffdc64f79..6d1ebc5cb 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/CeylonPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/CeylonPresentationReconciler.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.ceylon;
+package org.eclipse.fx.code.editor.langs.codegen.fx.ceylon;
public class CeylonPresentationReconciler extends org.eclipse.fx.text.ui.presentation.PresentationReconciler {
public CeylonPresentationReconciler() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__ceylon_multi_line_api_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__ceylon_multi_line_api_comment.java
index fd029b097..c847c28c0 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__ceylon_multi_line_api_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__ceylon_multi_line_api_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.ceylon;
+package org.eclipse.fx.code.editor.langs.codegen.fx.ceylon;
public class Ceylon__ceylon_multi_line_api_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Ceylon__ceylon_multi_line_api_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__ceylon_multi_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__ceylon_multi_line_comment.java
index affa860ed..d6637c226 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__ceylon_multi_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__ceylon_multi_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.ceylon;
+package org.eclipse.fx.code.editor.langs.codegen.fx.ceylon;
public class Ceylon__ceylon_multi_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Ceylon__ceylon_multi_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__ceylon_single_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__ceylon_single_line_comment.java
index 155124167..90eafd832 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__ceylon_single_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__ceylon_single_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.ceylon;
+package org.eclipse.fx.code.editor.langs.codegen.fx.ceylon;
public class Ceylon__ceylon_single_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Ceylon__ceylon_single_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__ceylon_string.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__ceylon_string.java
index 303b3b48d..c95b502c2 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__ceylon_string.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__ceylon_string.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.ceylon;
+package org.eclipse.fx.code.editor.langs.codegen.fx.ceylon;
public class Ceylon__ceylon_string extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Ceylon__ceylon_string() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__dftl_partition_content_type.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__dftl_partition_content_type.java
index 78cf0d4c1..e4f1aa89a 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/ceylon/Ceylon__dftl_partition_content_type.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/ceylon/Ceylon__dftl_partition_content_type.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.ceylon;
+package org.eclipse.fx.code.editor.langs.codegen.fx.ceylon;
public class Ceylon__dftl_partition_content_type extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Ceylon__dftl_partition_content_type() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/DartPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/DartPartitionScanner.java
index 9215ed55c..cb467c4ad 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/DartPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/DartPartitionScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.dart;
+package org.eclipse.fx.code.editor.langs.codegen.fx.dart;
public class DartPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPartitionScanner {
public DartPartitionScanner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/DartPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/DartPartitioner.java
index a2fbc9e3b..52d78db07 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/DartPartitioner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/DartPartitioner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.dart;
+package org.eclipse.fx.code.editor.langs.codegen.fx.dart;
public class DartPartitioner extends org.eclipse.jface.text.rules.FastPartitioner {
public DartPartitioner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/DartPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/DartPresentationReconciler.java
index c85e0a02d..d99aab274 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/DartPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/DartPresentationReconciler.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.dart;
+package org.eclipse.fx.code.editor.langs.codegen.fx.dart;
public class DartPresentationReconciler extends org.eclipse.fx.text.ui.presentation.PresentationReconciler {
public DartPresentationReconciler() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_multiline_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_multiline_comment.java
index 51aeb5f2c..c94c2e10f 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_multiline_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_multiline_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.dart;
+package org.eclipse.fx.code.editor.langs.codegen.fx.dart;
public class Dart__dart_multiline_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Dart__dart_multiline_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_multilinedoc_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_multilinedoc_comment.java
index 33ae8ed28..13f7ed489 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_multilinedoc_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_multilinedoc_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.dart;
+package org.eclipse.fx.code.editor.langs.codegen.fx.dart;
public class Dart__dart_multilinedoc_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Dart__dart_multilinedoc_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_singleline_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_singleline_comment.java
index bfc23eb9e..c3e76d572 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_singleline_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_singleline_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.dart;
+package org.eclipse.fx.code.editor.langs.codegen.fx.dart;
public class Dart__dart_singleline_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Dart__dart_singleline_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_singlelinedoc_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_singlelinedoc_comment.java
index 407a2176f..00967865b 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_singlelinedoc_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_singlelinedoc_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.dart;
+package org.eclipse.fx.code.editor.langs.codegen.fx.dart;
public class Dart__dart_singlelinedoc_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Dart__dart_singlelinedoc_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_string.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_string.java
index 81800cbfa..a485732bf 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dart_string.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dart_string.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.dart;
+package org.eclipse.fx.code.editor.langs.codegen.fx.dart;
public class Dart__dart_string extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Dart__dart_string() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dftl_partition_content_type.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dftl_partition_content_type.java
index a65a0fa28..55e74a30a 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/dart/Dart__dftl_partition_content_type.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/dart/Dart__dftl_partition_content_type.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.dart;
+package org.eclipse.fx.code.editor.langs.codegen.fx.dart;
public class Dart__dftl_partition_content_type extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Dart__dftl_partition_content_type() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/GoPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/GoPartitionScanner.java
index 303269515..0d781451e 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/GoPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/GoPartitionScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.go;
+package org.eclipse.fx.code.editor.langs.codegen.fx.go;
public class GoPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPartitionScanner {
public GoPartitionScanner() {
@@ -19,13 +19,13 @@ public class GoPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPa
"\""
, "\""
, new org.eclipse.jface.text.rules.Token("__go_string")
- , (char)0
+ , '\\'
, false);
pr[3] = new org.eclipse.jface.text.rules.SingleLineRule(
"'"
, "'"
, new org.eclipse.jface.text.rules.Token("__go_string")
- , (char)0
+ , '\\'
, false);
pr[4] = new org.eclipse.jface.text.rules.SingleLineRule(
"`"
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/GoPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/GoPartitioner.java
index dbb376ee6..2d139fa05 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/GoPartitioner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/GoPartitioner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.go;
+package org.eclipse.fx.code.editor.langs.codegen.fx.go;
public class GoPartitioner extends org.eclipse.jface.text.rules.FastPartitioner {
public GoPartitioner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/GoPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/GoPresentationReconciler.java
index cdcbc1725..d122ce5ae 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/GoPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/GoPresentationReconciler.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.go;
+package org.eclipse.fx.code.editor.langs.codegen.fx.go;
public class GoPresentationReconciler extends org.eclipse.fx.text.ui.presentation.PresentationReconciler {
public GoPresentationReconciler() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/Go__dftl_partition_content_type.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/Go__dftl_partition_content_type.java
index 0be746b8b..187732412 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/Go__dftl_partition_content_type.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/Go__dftl_partition_content_type.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.go;
+package org.eclipse.fx.code.editor.langs.codegen.fx.go;
public class Go__dftl_partition_content_type extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Go__dftl_partition_content_type() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/Go__go_multi_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/Go__go_multi_line_comment.java
index 9e6febb9b..a0aa03839 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/Go__go_multi_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/Go__go_multi_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.go;
+package org.eclipse.fx.code.editor.langs.codegen.fx.go;
public class Go__go_multi_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Go__go_multi_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/Go__go_single_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/Go__go_single_line_comment.java
index d4768fe1c..94b1b0cfc 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/Go__go_single_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/Go__go_single_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.go;
+package org.eclipse.fx.code.editor.langs.codegen.fx.go;
public class Go__go_single_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Go__go_single_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/Go__go_string.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/Go__go_string.java
index 4d9c0c160..d0b85090e 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/Go__go_string.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/go/Go__go_string.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.go;
+package org.eclipse.fx.code.editor.langs.codegen.fx.go;
public class Go__go_string extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Go__go_string() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/GroovyPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/GroovyPartitionScanner.java
index 0853f2327..1ff159e25 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/GroovyPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/GroovyPartitionScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.groovy;
+package org.eclipse.fx.code.editor.langs.codegen.fx.groovy;
public class GroovyPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPartitionScanner {
public GroovyPartitionScanner() {
@@ -19,13 +19,13 @@ public class GroovyPartitionScanner extends org.eclipse.jface.text.rules.RuleBas
"\""
, "\""
, new org.eclipse.jface.text.rules.Token("__groovy_string")
- , (char)0
+ , '\\'
, false);
pr[3] = new org.eclipse.jface.text.rules.SingleLineRule(
"'"
, "'"
, new org.eclipse.jface.text.rules.Token("__groovy_character")
- , (char)0
+ , '\\'
, false);
setPredicateRules(pr);
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/GroovyPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/GroovyPartitioner.java
index 221a95f07..2bffd5b4d 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/GroovyPartitioner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/GroovyPartitioner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.groovy;
+package org.eclipse.fx.code.editor.langs.codegen.fx.groovy;
public class GroovyPartitioner extends org.eclipse.jface.text.rules.FastPartitioner {
public GroovyPartitioner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/GroovyPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/GroovyPresentationReconciler.java
index 36b91e2f9..8433035d2 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/GroovyPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/GroovyPresentationReconciler.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.groovy;
+package org.eclipse.fx.code.editor.langs.codegen.fx.groovy;
public class GroovyPresentationReconciler extends org.eclipse.fx.text.ui.presentation.PresentationReconciler {
public GroovyPresentationReconciler() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__dftl_partition_content_type.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__dftl_partition_content_type.java
index 0d1b384d0..11e78f00d 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__dftl_partition_content_type.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__dftl_partition_content_type.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.groovy;
+package org.eclipse.fx.code.editor.langs.codegen.fx.groovy;
public class Groovy__dftl_partition_content_type extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Groovy__dftl_partition_content_type() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_apidoc.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_apidoc.java
index 3d0549bf4..24ecd7eb8 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_apidoc.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_apidoc.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.groovy;
+package org.eclipse.fx.code.editor.langs.codegen.fx.groovy;
public class Groovy__groovy_apidoc extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Groovy__groovy_apidoc() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_character.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_character.java
index 2544eaaf1..fdeba726d 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_character.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_character.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.groovy;
+package org.eclipse.fx.code.editor.langs.codegen.fx.groovy;
public class Groovy__groovy_character extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Groovy__groovy_character() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_multiline_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_multiline_comment.java
index 0e5eb39f9..e6ae605c4 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_multiline_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_multiline_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.groovy;
+package org.eclipse.fx.code.editor.langs.codegen.fx.groovy;
public class Groovy__groovy_multiline_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Groovy__groovy_multiline_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_singleline_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_singleline_comment.java
index a5ea3aa12..4fd5f5775 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_singleline_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_singleline_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.groovy;
+package org.eclipse.fx.code.editor.langs.codegen.fx.groovy;
public class Groovy__groovy_singleline_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Groovy__groovy_singleline_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_string.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_string.java
index 5c7a37747..cce8e493b 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/Groovy__groovy_string.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/groovy/Groovy__groovy_string.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.groovy;
+package org.eclipse.fx.code.editor.langs.codegen.fx.groovy;
public class Groovy__groovy_string extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Groovy__groovy_string() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/JavaPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/JavaPartitionScanner.java
index 41402d896..86bb6d7a5 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/JavaPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/JavaPartitionScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.java;
+package org.eclipse.fx.code.editor.langs.codegen.fx.java;
public class JavaPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPartitionScanner {
public JavaPartitionScanner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/JavaPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/JavaPartitioner.java
index a4c9ed506..2e4d24b7d 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/JavaPartitioner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/JavaPartitioner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.java;
+package org.eclipse.fx.code.editor.langs.codegen.fx.java;
public class JavaPartitioner extends org.eclipse.jface.text.rules.FastPartitioner {
public JavaPartitioner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/JavaPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/JavaPresentationReconciler.java
index f8cc41f1b..46b307c0f 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/JavaPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/JavaPresentationReconciler.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.java;
+package org.eclipse.fx.code.editor.langs.codegen.fx.java;
public class JavaPresentationReconciler extends org.eclipse.fx.text.ui.presentation.PresentationReconciler {
public JavaPresentationReconciler() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__dftl_partition_content_type.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__dftl_partition_content_type.java
index db46c858f..3a8f3d7a0 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__dftl_partition_content_type.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__dftl_partition_content_type.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.java;
+package org.eclipse.fx.code.editor.langs.codegen.fx.java;
public class Java__dftl_partition_content_type extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Java__dftl_partition_content_type() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__java_multi_line_api_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__java_multi_line_api_comment.java
index 6be14af17..a7ca1cc95 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__java_multi_line_api_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__java_multi_line_api_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.java;
+package org.eclipse.fx.code.editor.langs.codegen.fx.java;
public class Java__java_multi_line_api_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Java__java_multi_line_api_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__java_multi_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__java_multi_line_comment.java
index bf3bf5688..caf5777e1 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__java_multi_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__java_multi_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.java;
+package org.eclipse.fx.code.editor.langs.codegen.fx.java;
public class Java__java_multi_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Java__java_multi_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__java_single_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__java_single_line_comment.java
index 672e3182b..f4abb7847 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__java_single_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__java_single_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.java;
+package org.eclipse.fx.code.editor.langs.codegen.fx.java;
public class Java__java_single_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Java__java_single_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__java_string.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__java_string.java
index 1a76b5453..396f48ced 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/java/Java__java_string.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/java/Java__java_string.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.java;
+package org.eclipse.fx.code.editor.langs.codegen.fx.java;
public class Java__java_string extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Java__java_string() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/JsPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/JsPartitionScanner.java
index e9febfd00..1f0a7c2ce 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/JsPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/JsPartitionScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.js;
+package org.eclipse.fx.code.editor.langs.codegen.fx.js;
public class JsPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPartitionScanner {
public JsPartitionScanner() {
@@ -19,13 +19,13 @@ public class JsPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPa
"'"
, "'"
, new org.eclipse.jface.text.rules.Token("__js_string")
- , (char)0
+ , '\\'
, false);
pr[3] = new org.eclipse.jface.text.rules.SingleLineRule(
"\""
, "\""
, new org.eclipse.jface.text.rules.Token("__js_string")
- , (char)0
+ , '\\'
, false);
setPredicateRules(pr);
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/JsPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/JsPartitioner.java
index 26d7ba4fe..bf381cd27 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/JsPartitioner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/JsPartitioner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.js;
+package org.eclipse.fx.code.editor.langs.codegen.fx.js;
public class JsPartitioner extends org.eclipse.jface.text.rules.FastPartitioner {
public JsPartitioner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/JsPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/JsPresentationReconciler.java
index 5f6a3aa3e..061173aaa 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/JsPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/JsPresentationReconciler.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.js;
+package org.eclipse.fx.code.editor.langs.codegen.fx.js;
public class JsPresentationReconciler extends org.eclipse.fx.text.ui.presentation.PresentationReconciler {
public JsPresentationReconciler() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/Js__dftl_partition_content_type.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/Js__dftl_partition_content_type.java
index 912433ea6..152e14c1f 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/Js__dftl_partition_content_type.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/Js__dftl_partition_content_type.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.js;
+package org.eclipse.fx.code.editor.langs.codegen.fx.js;
public class Js__dftl_partition_content_type extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Js__dftl_partition_content_type() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/Js__js_multi_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/Js__js_multi_line_comment.java
index 52a4612b0..1d0afdd77 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/Js__js_multi_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/Js__js_multi_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.js;
+package org.eclipse.fx.code.editor.langs.codegen.fx.js;
public class Js__js_multi_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Js__js_multi_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/Js__js_single_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/Js__js_single_line_comment.java
index a3f9d29ef..11acb59e0 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/Js__js_single_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/Js__js_single_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.js;
+package org.eclipse.fx.code.editor.langs.codegen.fx.js;
public class Js__js_single_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Js__js_single_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/Js__js_string.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/Js__js_string.java
index 9a761991d..4de6d400a 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/Js__js_string.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/js/Js__js_string.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.js;
+package org.eclipse.fx.code.editor.langs.codegen.fx.js;
public class Js__js_string extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Js__js_string() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/KotlinPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/KotlinPartitionScanner.java
index 473a564b6..c8176a85e 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/KotlinPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/KotlinPartitionScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.kotlin;
+package org.eclipse.fx.code.editor.langs.codegen.fx.kotlin;
public class KotlinPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPartitionScanner {
public KotlinPartitionScanner() {
@@ -25,7 +25,7 @@ public class KotlinPartitionScanner extends org.eclipse.jface.text.rules.RuleBas
"\""
, "\""
, new org.eclipse.jface.text.rules.Token("__kotlin_string")
- , (char)0
+ , '\\'
, false);
setPredicateRules(pr);
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/KotlinPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/KotlinPartitioner.java
index 8da4227f5..c497dbb9e 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/KotlinPartitioner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/KotlinPartitioner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.kotlin;
+package org.eclipse.fx.code.editor.langs.codegen.fx.kotlin;
public class KotlinPartitioner extends org.eclipse.jface.text.rules.FastPartitioner {
public KotlinPartitioner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/KotlinPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/KotlinPresentationReconciler.java
index 1a8d7081a..63de1a1d5 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/KotlinPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/KotlinPresentationReconciler.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.kotlin;
+package org.eclipse.fx.code.editor.langs.codegen.fx.kotlin;
public class KotlinPresentationReconciler extends org.eclipse.fx.text.ui.presentation.PresentationReconciler {
public KotlinPresentationReconciler() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__dftl_partition_content_type.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__dftl_partition_content_type.java
index e4dd79c84..5ac073de4 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__dftl_partition_content_type.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__dftl_partition_content_type.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.kotlin;
+package org.eclipse.fx.code.editor.langs.codegen.fx.kotlin;
public class Kotlin__dftl_partition_content_type extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Kotlin__dftl_partition_content_type() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__kotlin_multi_line_api_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__kotlin_multi_line_api_comment.java
index f873e1014..aaf462c8c 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__kotlin_multi_line_api_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__kotlin_multi_line_api_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.kotlin;
+package org.eclipse.fx.code.editor.langs.codegen.fx.kotlin;
public class Kotlin__kotlin_multi_line_api_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Kotlin__kotlin_multi_line_api_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__kotlin_multi_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__kotlin_multi_line_comment.java
index 68bc45729..f9404dd64 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__kotlin_multi_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__kotlin_multi_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.kotlin;
+package org.eclipse.fx.code.editor.langs.codegen.fx.kotlin;
public class Kotlin__kotlin_multi_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Kotlin__kotlin_multi_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__kotlin_single_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__kotlin_single_line_comment.java
index b844c9d7e..38be0a70f 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__kotlin_single_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__kotlin_single_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.kotlin;
+package org.eclipse.fx.code.editor.langs.codegen.fx.kotlin;
public class Kotlin__kotlin_single_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Kotlin__kotlin_single_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__kotlin_string.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__kotlin_string.java
index 4b9c62a16..e6fe38ace 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/Kotlin__kotlin_string.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/kotlin/Kotlin__kotlin_string.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.kotlin;
+package org.eclipse.fx.code.editor.langs.codegen.fx.kotlin;
public class Kotlin__kotlin_string extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Kotlin__kotlin_string() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/LuaPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/LuaPartitionScanner.java
index 6245a6c2b..ff21d54b5 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/LuaPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/LuaPartitionScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.lua;
+package org.eclipse.fx.code.editor.langs.codegen.fx.lua;
public class LuaPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPartitionScanner {
public LuaPartitionScanner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/LuaPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/LuaPartitioner.java
index ae6158169..19ec267a7 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/LuaPartitioner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/LuaPartitioner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.lua;
+package org.eclipse.fx.code.editor.langs.codegen.fx.lua;
public class LuaPartitioner extends org.eclipse.jface.text.rules.FastPartitioner {
public LuaPartitioner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/LuaPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/LuaPresentationReconciler.java
index e72fe86b7..58bdde8fa 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/LuaPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/LuaPresentationReconciler.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.lua;
+package org.eclipse.fx.code.editor.langs.codegen.fx.lua;
public class LuaPresentationReconciler extends org.eclipse.fx.text.ui.presentation.PresentationReconciler {
public LuaPresentationReconciler() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/Lua__dftl_partition_content_type.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/Lua__dftl_partition_content_type.java
index ad929b7ee..e5b917f80 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/Lua__dftl_partition_content_type.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/Lua__dftl_partition_content_type.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.lua;
+package org.eclipse.fx.code.editor.langs.codegen.fx.lua;
public class Lua__dftl_partition_content_type extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Lua__dftl_partition_content_type() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/Lua__lua_multi_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/Lua__lua_multi_line_comment.java
index 9c4a6a1aa..40e08d4fa 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/Lua__lua_multi_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/Lua__lua_multi_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.lua;
+package org.eclipse.fx.code.editor.langs.codegen.fx.lua;
public class Lua__lua_multi_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Lua__lua_multi_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/Lua__lua_single_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/Lua__lua_single_line_comment.java
index 97f0e1b84..58362ea07 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/Lua__lua_single_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/Lua__lua_single_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.lua;
+package org.eclipse.fx.code.editor.langs.codegen.fx.lua;
public class Lua__lua_single_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Lua__lua_single_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/Lua__lua_string.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/Lua__lua_string.java
index 7fb17a3a1..5fd2c66ed 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/lua/Lua__lua_string.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/lua/Lua__lua_string.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.lua;
+package org.eclipse.fx.code.editor.langs.codegen.fx.lua;
public class Lua__lua_string extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Lua__lua_string() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/PhpPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/PhpPartitionScanner.java
index 10f9521ff..abb62807b 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/PhpPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/PhpPartitionScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.php;
+package org.eclipse.fx.code.editor.langs.codegen.fx.php;
public class PhpPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPartitionScanner {
public PhpPartitionScanner() {
@@ -7,13 +7,13 @@ public class PhpPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedP
"\""
, "\""
, new org.eclipse.jface.text.rules.Token("__php_string")
- , (char)0
+ , '\\'
, false);
pr[1] = new org.eclipse.jface.text.rules.SingleLineRule(
"'"
, "'"
, new org.eclipse.jface.text.rules.Token("__php_string")
- , (char)0
+ , '\\'
, false);
pr[2] = new org.eclipse.jface.text.rules.MultiLineRule(
"/*"
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/PhpPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/PhpPartitioner.java
index a53f958fd..c092cff50 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/PhpPartitioner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/PhpPartitioner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.php;
+package org.eclipse.fx.code.editor.langs.codegen.fx.php;
public class PhpPartitioner extends org.eclipse.jface.text.rules.FastPartitioner {
public PhpPartitioner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/PhpPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/PhpPresentationReconciler.java
index bc0643f65..338144cec 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/PhpPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/PhpPresentationReconciler.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.php;
+package org.eclipse.fx.code.editor.langs.codegen.fx.php;
public class PhpPresentationReconciler extends org.eclipse.fx.text.ui.presentation.PresentationReconciler {
public PhpPresentationReconciler() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/Php__dftl_partition_content_type.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/Php__dftl_partition_content_type.java
index 9984ae157..ebd6843f5 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/Php__dftl_partition_content_type.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/Php__dftl_partition_content_type.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.php;
+package org.eclipse.fx.code.editor.langs.codegen.fx.php;
public class Php__dftl_partition_content_type extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Php__dftl_partition_content_type() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/Php__php_multiline_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/Php__php_multiline_comment.java
index 04f35cf9a..d99bc2060 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/Php__php_multiline_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/Php__php_multiline_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.php;
+package org.eclipse.fx.code.editor.langs.codegen.fx.php;
public class Php__php_multiline_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Php__php_multiline_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/Php__php_string.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/Php__php_string.java
index c32bc176a..d813c3a39 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/Php__php_string.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/php/Php__php_string.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.php;
+package org.eclipse.fx.code.editor.langs.codegen.fx.php;
public class Php__php_string extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Php__php_string() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/PyPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/PyPartitionScanner.java
index 458fc1ae0..4656a88cc 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/PyPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/PyPartitionScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.python;
+package org.eclipse.fx.code.editor.langs.codegen.fx.python;
public class PyPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPartitionScanner {
public PyPartitionScanner() {
@@ -7,7 +7,7 @@ public class PyPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPa
"\""
, "\""
, new org.eclipse.jface.text.rules.Token("__python_string")
- , (char)0
+ , '\\'
, false);
pr[1] = new org.eclipse.jface.text.rules.SingleLineRule(
"#"
@@ -25,7 +25,7 @@ public class PyPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPa
"'"
, "'"
, new org.eclipse.jface.text.rules.Token("__python_string")
- , (char)0
+ , '\\'
, false);
setPredicateRules(pr);
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/PyPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/PyPartitioner.java
index ca7ac6708..446c09512 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/PyPartitioner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/PyPartitioner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.python;
+package org.eclipse.fx.code.editor.langs.codegen.fx.python;
public class PyPartitioner extends org.eclipse.jface.text.rules.FastPartitioner {
public PyPartitioner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/PyPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/PyPresentationReconciler.java
index 55551133a..e9b436ada 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/PyPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/PyPresentationReconciler.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.python;
+package org.eclipse.fx.code.editor.langs.codegen.fx.python;
public class PyPresentationReconciler extends org.eclipse.fx.text.ui.presentation.PresentationReconciler {
public PyPresentationReconciler() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/Py__dftl_partition_content_type.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/Py__dftl_partition_content_type.java
index b947c9a4a..8c87e0d47 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/Py__dftl_partition_content_type.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/Py__dftl_partition_content_type.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.python;
+package org.eclipse.fx.code.editor.langs.codegen.fx.python;
public class Py__dftl_partition_content_type extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Py__dftl_partition_content_type() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/Py__python_multiline_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/Py__python_multiline_comment.java
index fe6d2955e..5356e698b 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/Py__python_multiline_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/Py__python_multiline_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.python;
+package org.eclipse.fx.code.editor.langs.codegen.fx.python;
public class Py__python_multiline_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Py__python_multiline_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/Py__python_singleline_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/Py__python_singleline_comment.java
index 367f7bffd..8665d255b 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/Py__python_singleline_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/Py__python_singleline_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.python;
+package org.eclipse.fx.code.editor.langs.codegen.fx.python;
public class Py__python_singleline_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Py__python_singleline_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/Py__python_string.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/Py__python_string.java
index fca0ebfe7..caee8432b 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/Py__python_string.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/python/Py__python_string.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.python;
+package org.eclipse.fx.code.editor.langs.codegen.fx.python;
public class Py__python_string extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Py__python_string() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/RustPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/RustPartitionScanner.java
index 540bd9ff6..11346e38d 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/RustPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/RustPartitionScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.rust;
+package org.eclipse.fx.code.editor.langs.codegen.fx.rust;
public class RustPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPartitionScanner {
public RustPartitionScanner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/RustPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/RustPartitioner.java
index 5a5013efd..918b24255 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/RustPartitioner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/RustPartitioner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.rust;
+package org.eclipse.fx.code.editor.langs.codegen.fx.rust;
public class RustPartitioner extends org.eclipse.jface.text.rules.FastPartitioner {
public RustPartitioner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/RustPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/RustPresentationReconciler.java
index d85f29b30..b09cccff2 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/RustPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/RustPresentationReconciler.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.rust;
+package org.eclipse.fx.code.editor.langs.codegen.fx.rust;
public class RustPresentationReconciler extends org.eclipse.fx.text.ui.presentation.PresentationReconciler {
public RustPresentationReconciler() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/Rust__dftl_partition_content_type.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/Rust__dftl_partition_content_type.java
index e9212a6a1..ea5595b74 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/Rust__dftl_partition_content_type.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/Rust__dftl_partition_content_type.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.rust;
+package org.eclipse.fx.code.editor.langs.codegen.fx.rust;
public class Rust__dftl_partition_content_type extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Rust__dftl_partition_content_type() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/Rust__rust_multi_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/Rust__rust_multi_line_comment.java
index 2d87c9227..d464046cb 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/Rust__rust_multi_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/Rust__rust_multi_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.rust;
+package org.eclipse.fx.code.editor.langs.codegen.fx.rust;
public class Rust__rust_multi_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Rust__rust_multi_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/Rust__rust_single_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/Rust__rust_single_line_comment.java
index 0cbcc6335..0cc19b65a 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/Rust__rust_single_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/Rust__rust_single_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.rust;
+package org.eclipse.fx.code.editor.langs.codegen.fx.rust;
public class Rust__rust_single_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Rust__rust_single_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/Rust__rust_string.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/Rust__rust_string.java
index 1ec691ab2..dee012a80 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/rust/Rust__rust_string.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/rust/Rust__rust_string.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.rust;
+package org.eclipse.fx.code.editor.langs.codegen.fx.rust;
public class Rust__rust_string extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Rust__rust_string() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/SwiftPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/SwiftPartitionScanner.java
index 42b93aed4..7c63fbb33 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/SwiftPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/SwiftPartitionScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.swift;
+package org.eclipse.fx.code.editor.langs.codegen.fx.swift;
public class SwiftPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPartitionScanner {
public SwiftPartitionScanner() {
@@ -19,7 +19,7 @@ public class SwiftPartitionScanner extends org.eclipse.jface.text.rules.RuleBase
"\""
, "\""
, new org.eclipse.jface.text.rules.Token("__swift_string")
- , (char)0
+ , '\\'
, false);
setPredicateRules(pr);
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/SwiftPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/SwiftPartitioner.java
index efa28f514..a61b86d50 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/SwiftPartitioner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/SwiftPartitioner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.swift;
+package org.eclipse.fx.code.editor.langs.codegen.fx.swift;
public class SwiftPartitioner extends org.eclipse.jface.text.rules.FastPartitioner {
public SwiftPartitioner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/SwiftPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/SwiftPresentationReconciler.java
index 21efee3e6..457c8a2fe 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/SwiftPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/SwiftPresentationReconciler.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.swift;
+package org.eclipse.fx.code.editor.langs.codegen.fx.swift;
public class SwiftPresentationReconciler extends org.eclipse.fx.text.ui.presentation.PresentationReconciler {
public SwiftPresentationReconciler() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/Swift__dftl_partition_content_type.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/Swift__dftl_partition_content_type.java
index 69cd46d8d..7b8e966b9 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/Swift__dftl_partition_content_type.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/Swift__dftl_partition_content_type.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.swift;
+package org.eclipse.fx.code.editor.langs.codegen.fx.swift;
public class Swift__dftl_partition_content_type extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Swift__dftl_partition_content_type() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/Swift__swift_multi_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/Swift__swift_multi_line_comment.java
index 7b08fb559..79155fd69 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/Swift__swift_multi_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/Swift__swift_multi_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.swift;
+package org.eclipse.fx.code.editor.langs.codegen.fx.swift;
public class Swift__swift_multi_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Swift__swift_multi_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/Swift__swift_single_line_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/Swift__swift_single_line_comment.java
index 325b7cb72..59a166088 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/Swift__swift_single_line_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/Swift__swift_single_line_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.swift;
+package org.eclipse.fx.code.editor.langs.codegen.fx.swift;
public class Swift__swift_single_line_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Swift__swift_single_line_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/Swift__swift_string.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/Swift__swift_string.java
index ba8e96b8a..ba88dfc89 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/Swift__swift_string.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/swift/Swift__swift_string.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.swift;
+package org.eclipse.fx.code.editor.langs.codegen.fx.swift;
public class Swift__swift_string extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Swift__swift_string() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/XmlPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/XmlPartitionScanner.java
index 04d102995..5534452f3 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/XmlPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/XmlPartitionScanner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.xml;
+package org.eclipse.fx.code.editor.langs.codegen.fx.xml;
public class XmlPartitionScanner extends org.eclipse.jface.text.rules.RuleBasedPartitionScanner {
public XmlPartitionScanner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/XmlPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/XmlPartitioner.java
index dce88278d..c25e12b48 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/XmlPartitioner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/XmlPartitioner.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.xml;
+package org.eclipse.fx.code.editor.langs.codegen.fx.xml;
public class XmlPartitioner extends org.eclipse.jface.text.rules.FastPartitioner {
public XmlPartitioner() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/XmlPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/XmlPresentationReconciler.java
index a0df80a5b..c2588c76c 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/XmlPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/XmlPresentationReconciler.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.xml;
+package org.eclipse.fx.code.editor.langs.codegen.fx.xml;
public class XmlPresentationReconciler extends org.eclipse.fx.text.ui.presentation.PresentationReconciler {
public XmlPresentationReconciler() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__dftl_partition_content_type.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__dftl_partition_content_type.java
index 67a8ae3cb..e1fbb2556 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__dftl_partition_content_type.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__dftl_partition_content_type.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.xml;
+package org.eclipse.fx.code.editor.langs.codegen.fx.xml;
public class Xml__dftl_partition_content_type extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Xml__dftl_partition_content_type() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_cdata.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_cdata.java
index 40fb01b66..6425ae2ce 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_cdata.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_cdata.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.xml;
+package org.eclipse.fx.code.editor.langs.codegen.fx.xml;
public class Xml__xml_cdata extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Xml__xml_cdata() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_comment.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_comment.java
index 1d346943b..fe94b70f4 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_comment.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_comment.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.xml;
+package org.eclipse.fx.code.editor.langs.codegen.fx.xml;
public class Xml__xml_comment extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Xml__xml_comment() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_decl.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_decl.java
index 3038deed7..750c71644 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_decl.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_decl.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.xml;
+package org.eclipse.fx.code.editor.langs.codegen.fx.xml;
public class Xml__xml_decl extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Xml__xml_decl() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_pi.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_pi.java
index 86629edbe..2472e5387 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_pi.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_pi.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.xml;
+package org.eclipse.fx.code.editor.langs.codegen.fx.xml;
public class Xml__xml_pi extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Xml__xml_pi() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_tag.java b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_tag.java
index 3e903a53f..fc7b6bd14 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/xml/Xml__xml_tag.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.codegen.fx/src/org/eclipse/fx/code/editor/langs/codegen/fx/xml/Xml__xml_tag.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.fx.xml;
+package org.eclipse.fx.code.editor.langs.codegen.fx.xml;
public class Xml__xml_tag extends org.eclipse.jface.text.rules.RuleBasedScanner {
public Xml__xml_tag() {
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.classpath b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/.classpath
index eca7bdba8..eca7bdba8 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.classpath
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/.classpath
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.gitignore b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/.gitignore
index 09e3bc9b2..09e3bc9b2 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.gitignore
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/.gitignore
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/.project b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/.project
index 2f82042a7..769c5383f 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/.project
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.fx.code.editor.ldef.text</name>
+ <name>org.eclipse.fx.code.editor.langs.contrib</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs.contrib/.settings/ca.ecliptical.pde.ds.prefs b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/.settings/ca.ecliptical.pde.ds.prefs
new file mode 100644
index 000000000..963a30719
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/.settings/ca.ecliptical.pde.ds.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+enabled=true
+path=OSGI-INF/services
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.settings/org.eclipse.jdt.core.prefs b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dc..0c68a61dc 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs.contrib/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..63d13ea77
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Contrib
+Bundle-SymbolicName: org.eclipse.fx.code.editor.langs.contrib
+Bundle-Version: 2.2.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.fx.code.editor.configuration.text,
+ org.eclipse.fx.code.editor,
+ org.eclipse.fx.code.editor.configuration,
+ org.eclipse.fx.core
+Import-Package: org.osgi.service.component.annotations;resolution:=optional
+Service-Component: OSGI-INF/services/org.eclipse.fx.code.editor.langs.contrib.LangsConfigurationModelProvider.xml
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs.contrib/OSGI-INF/services/org.eclipse.fx.code.editor.langs.contrib.LangsConfigurationModelProvider.xml b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/OSGI-INF/services/org.eclipse.fx.code.editor.langs.contrib.LangsConfigurationModelProvider.xml
new file mode 100644
index 000000000..29c223f38
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/OSGI-INF/services/org.eclipse.fx.code.editor.langs.contrib.LangsConfigurationModelProvider.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.fx.code.editor.langs.contrib.LangsConfigurationModelProvider">
+ <service>
+ <provide interface="org.eclipse.fx.code.editor.configuration.text.ConfigurationModelProvider"/>
+ </service>
+ <implementation class="org.eclipse.fx.code.editor.langs.contrib.LangsConfigurationModelProvider"/>
+</scr:component> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/build.properties b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/build.properties
index 17daa5b49..c58ea2178 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/build.properties
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/build.properties
@@ -2,4 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- about.html
+ OSGI-INF/
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/pom.xml b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/pom.xml
index 9f9376e9c..80fb16f11 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/pom.xml
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/pom.xml
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>e(fx)clipse - Runtime - Code - Language infrastructure for various languages</name>
+ <name>e(fx)clipse - Runtime - Code - Contribution of JSON based configurations</name>
<groupId>org.eclipse.fx.runtime</groupId>
- <artifactId>org.eclipse.fx.code.editor.ldef.langs.fx</artifactId>
+ <artifactId>org.eclipse.fx.code.editor.langs.contrib</artifactId>
<packaging>eclipse-plugin</packaging>
<parent>
@@ -31,4 +31,4 @@
</plugins>
</build>
-</project> \ No newline at end of file
+</project>
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs.contrib/src/org/eclipse/fx/code/editor/langs/contrib/LangsConfigurationModelProvider.java b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/src/org/eclipse/fx/code/editor/langs/contrib/LangsConfigurationModelProvider.java
new file mode 100644
index 000000000..26b10e640
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.contrib/src/org/eclipse/fx/code/editor/langs/contrib/LangsConfigurationModelProvider.java
@@ -0,0 +1,87 @@
+package org.eclipse.fx.code.editor.langs.contrib;
+
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.fx.code.editor.Input;
+import org.eclipse.fx.code.editor.configuration.EditorGModel;
+import org.eclipse.fx.code.editor.configuration.LanguageDef;
+import org.eclipse.fx.code.editor.configuration.text.ConfigurationModelProvider;
+import org.eclipse.fx.code.editor.services.URIProvider;
+import org.eclipse.fx.core.log.LoggerCreator;
+import org.osgi.service.component.annotations.Component;
+
+@SuppressWarnings("restriction")
+@Component
+public class LangsConfigurationModelProvider implements ConfigurationModelProvider {
+ private final Map<String,URL> definitionURI = new HashMap<>();
+ private final Map<String,LanguageDef> definitionCache = new HashMap<>();
+
+ public LangsConfigurationModelProvider() {
+ try {
+ register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/adoc.json"),"adoc");
+ register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/ceylon.json"),"ceylon");
+ register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/dart.json"),"dart");
+// register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/gls.json"),"gls");
+ register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/go.json"),"go");
+ register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/groovy.json"),"groovy");
+ register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/java.json"),"java");
+ register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/js.json"),"js");
+ register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/kotlin.json"),"kotlin");
+ register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/lua.json"),"lua");
+ register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/php.json"),"php");
+ register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/py.json"),"py");
+ register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/rust.json"),"rust");
+ register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/swift.json"),"swift");
+ register(new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/xml.json"),"xml");
+ } catch(Throwable t) {
+ LoggerCreator.createLogger(LangsConfigurationModelProvider.class).error("Invalid URL", t);
+ }
+ }
+
+ private void register(URL uri, String fileSuffix) {
+ definitionURI.put(fileSuffix, uri);
+ }
+
+ @Override
+ public boolean applies(Input<?> input) {
+ if( input instanceof URIProvider ) {
+ String uri = ((URIProvider) input).getURI();
+ String[] parts = uri.split("/");
+ String lastSegment = parts[parts.length-1];
+ int idx = lastSegment.lastIndexOf('.');
+ if( idx != -1 ) {
+ boolean rv = definitionURI.containsKey(lastSegment.substring(idx+1));
+ return rv;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public LanguageDef getModel(Input<?> input) {
+ if( input instanceof URIProvider ) {
+ String uri = ((URIProvider) input).getURI();
+ String[] parts = uri.split("/");
+ String lastSegment = parts[parts.length-1];
+ int idx = lastSegment.lastIndexOf('.');
+ if( idx != -1 ) {
+ return getModelByExtension(lastSegment.substring(idx+1));
+ }
+ }
+ return null;
+ }
+
+ public LanguageDef getModelByExtension(String extension) {
+ return definitionCache.computeIfAbsent(extension, (e) -> {
+ try {
+ return EditorGModel.create().createObject(new InputStreamReader(definitionURI.get(e).openStream()));
+ } catch (Exception e1) {
+ LoggerCreator.createLogger(LangsConfigurationModelProvider.class).error("Unable to load json file '"+definitionURI.get(e)+"'", e1);
+ }
+ return null;
+ });
+ }
+}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.classpath b/bundles/code/org.eclipse.fx.code.editor.langs.themes/.classpath
index eca7bdba8..eca7bdba8 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.classpath
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.themes/.classpath
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.gitignore b/bundles/code/org.eclipse.fx.code.editor.langs.themes/.gitignore
index 09e3bc9b2..09e3bc9b2 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.gitignore
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.themes/.gitignore
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.project b/bundles/code/org.eclipse.fx.code.editor.langs.themes/.project
index cd1c3645e..e2b036a46 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.project
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.themes/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.fx.code.editor.ldef.text.fx</name>
+ <name>org.eclipse.fx.code.editor.langs.themes</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs.themes/.settings/ca.ecliptical.pde.ds.prefs b/bundles/code/org.eclipse.fx.code.editor.langs.themes/.settings/ca.ecliptical.pde.ds.prefs
new file mode 100644
index 000000000..963a30719
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.themes/.settings/ca.ecliptical.pde.ds.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+enabled=true
+path=OSGI-INF/services
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.settings/org.eclipse.jdt.core.prefs b/bundles/code/org.eclipse.fx.code.editor.langs.themes/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dc..0c68a61dc 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.themes/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs.themes/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.langs.themes/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..f2059d696
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.themes/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Themes
+Bundle-SymbolicName: org.eclipse.fx.code.editor.langs.themes
+Bundle-Version: 2.2.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: org.eclipse.fx.ui.services.theme;version="2.2.0",
+ org.osgi.service.component.annotations
+Service-Component: OSGI-INF/services/org.eclipse.fx.code.editor.langs.themes.DefaultEditorStylesheets.xml
+Require-Bundle: org.eclipse.jdt.annotation;bundle-version="2.0.100";resolution:=optional
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.langs.themes.DefaultEditorStylesheets.xml b/bundles/code/org.eclipse.fx.code.editor.langs.themes/OSGI-INF/services/org.eclipse.fx.code.editor.langs.themes.DefaultEditorStylesheets.xml
index 65bc7affd..12a2cf830 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.langs.themes.DefaultEditorStylesheets.xml
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.themes/OSGI-INF/services/org.eclipse.fx.code.editor.langs.themes.DefaultEditorStylesheets.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.fx.code.editor.ldef.langs.themes.DefaultEditorStylesheets">
- <implementation class="org.eclipse.fx.code.editor.ldef.langs.themes.DefaultEditorStylesheets"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.fx.code.editor.langs.themes.DefaultEditorStylesheets">
<service>
<provide interface="org.eclipse.fx.ui.services.theme.MultiURLStylesheet"/>
</service>
+ <implementation class="org.eclipse.fx.code.editor.langs.themes.DefaultEditorStylesheets"/>
</scr:component> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/build.properties b/bundles/code/org.eclipse.fx.code.editor.langs.themes/build.properties
index 626772844..c58ea2178 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/build.properties
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.themes/build.properties
@@ -1,6 +1,5 @@
+source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- OSGI-INF/,\
- about.html
-source.. = src/
+ OSGI-INF/
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/pom.xml b/bundles/code/org.eclipse.fx.code.editor.langs.themes/pom.xml
index 593daea63..6707cf135 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/pom.xml
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.themes/pom.xml
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>e(fx)clipse - Runtime - Code - LDef JavaFX Text</name>
+ <name>e(fx)clipse - Runtime - Code - Themes for languages</name>
<groupId>org.eclipse.fx.runtime</groupId>
- <artifactId>org.eclipse.fx.code.editor.ldef.text.fx</artifactId>
+ <artifactId>org.eclipse.fx.code.editor.langs.themes</artifactId>
<packaging>eclipse-plugin</packaging>
<parent>
@@ -31,4 +31,4 @@
</plugins>
</build>
-</project> \ No newline at end of file
+</project>
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/src/org/eclipse/fx/code/editor/ldef/langs/themes/DefaultEditorStylesheets.java b/bundles/code/org.eclipse.fx.code.editor.langs.themes/src/org/eclipse/fx/code/editor/langs/themes/DefaultEditorStylesheets.java
index 8a0989095..7dea2052b 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/src/org/eclipse/fx/code/editor/ldef/langs/themes/DefaultEditorStylesheets.java
+++ b/bundles/code/org.eclipse.fx.code.editor.langs.themes/src/org/eclipse/fx/code/editor/langs/themes/DefaultEditorStylesheets.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.ldef.langs.themes;
+package org.eclipse.fx.code.editor.langs.themes;
import java.net.MalformedURLException;
import java.net.URL;
@@ -20,20 +20,20 @@ public class DefaultEditorStylesheets implements MultiURLStylesheet {
try {
stylesheets = FXCollections.observableArrayList(
- new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/dart/highlight.css")
- , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/js/highlight.css")
- , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/java/highlight.css")
- , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/xml/highlight.css")
- , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/go/highlight.css")
- , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/rust/highlight.css")
- , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/swift/highlight.css")
- , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/groovy/highlight.css")
- , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/python/highlight.css")
- , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/ceylon/highlight.css")
- , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/kotlin/highlight.css")
- , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/php/highlight.css")
- , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/asciidoc/highlight.css")
- , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/lua/highlight.css")
+ new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/adoc.css")
+ , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/ceylon.css")
+ , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/dart.css")
+ , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/go.css")
+ , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/groovy.css")
+ , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/java.css")
+ , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/js.css")
+ , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/kotlin.css")
+ , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/lua.css")
+ , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/php.css")
+ , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/python.css")
+ , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/rust.css")
+ , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/swift.css")
+ , new URL("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/xml.css")
);
} catch (MalformedURLException e) {
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/.classpath b/bundles/code/org.eclipse.fx.code.editor.langs/.classpath
index eca7bdba8..f0c554985 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/.classpath
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/.classpath
@@ -3,5 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src-gen"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/build.properties b/bundles/code/org.eclipse.fx.code.editor.langs/build.properties
index 41add1c12..5361b448e 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/build.properties
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/build.properties
@@ -2,4 +2,5 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
about.html
-source.. = src/
+source.. = src/,\
+ src-gen/
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/adoc.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/adoc.json
new file mode 100644
index 000000000..272061cce
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/adoc.json
@@ -0,0 +1,454 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "adoc",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "adoc_default",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_block",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "****"
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "++++"
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "____"
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "----"
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_header",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "."
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_header_attribute",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": ":"
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_section_0",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "\u003d "
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_section_1",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "\u003d\u003d "
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_section_2",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "\u003d\u003d\u003d "
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_section_3",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "\u003d\u003d\u003d\u003d "
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_section_4",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "\u003d\u003d\u003d\u003d\u003d "
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_section_5",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "\u003d\u003d\u003d\u003d\u003d\u003d "
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_mono_bold_italic",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "__**``",
+ "startSeq": "``**__"
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "_*`",
+ "startSeq": "`*_"
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_bold_italic",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "_**",
+ "startSeq": "**_"
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "_*",
+ "startSeq": "*_"
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_mono_bold",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "*`",
+ "startSeq": "`*"
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "**``",
+ "startSeq": "``**"
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_mono_italic",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "_`",
+ "startSeq": "`_"
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "__``",
+ "startSeq": "``__"
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_italic",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "__",
+ "startSeq": "__"
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "_",
+ "startSeq": "_"
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_bold",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "**",
+ "startSeq": "**"
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "*",
+ "startSeq": "*"
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_literal",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "``",
+ "startSeq": "``"
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "`",
+ "startSeq": "`"
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_super",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "^",
+ "startSeq": "^"
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_sub",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "~",
+ "startSeq": "~"
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "adoc_admonition",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "NOTE:"
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "TIP:"
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "IMPORTANT:"
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "WARNING:"
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "check": {
+ "$gtype": "Equals",
+ "value": 0
+ },
+ "startSeq": "CAUTION:"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__adoc_multiline_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "////",
+ "startSeq": "////"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "adoc_comment",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__adoc_singleline_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "startSeq": "//"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "adoc_comment",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__adoc_literal_block",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "....",
+ "startSeq": "...."
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "adoc_literal",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__adoc_multiline_code",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "----",
+ "startSeq": "----"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "adoc_code",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__adoc_list_entry",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "startSeq": "* "
+ }
+ ],
+ "tokenList": []
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/ceylon.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/ceylon.json
new file mode 100644
index 000000000..243e80869
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/ceylon.json
@@ -0,0 +1,182 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "ceylon",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "ceylon_default",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "ceylon_keyword",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "abstracts",
+ "alias",
+ "assembly",
+ "assert",
+ "assign",
+ "break",
+ "case",
+ "catch",
+ "class",
+ "continue",
+ "dynamic",
+ "else",
+ "exists",
+ "extends",
+ "finally",
+ "for",
+ "function",
+ "given",
+ "if",
+ "import",
+ "in",
+ "interface",
+ "is",
+ "let",
+ "module",
+ "new",
+ "nonempty",
+ "object",
+ "of",
+ "out",
+ "outer",
+ "package",
+ "return",
+ "satisfies",
+ "super",
+ "switch",
+ "then",
+ "this",
+ "throw",
+ "try",
+ "value",
+ "void",
+ "while"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "ceylon_annotation",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "abstract",
+ "actual",
+ "annotation",
+ "default",
+ "deprecated",
+ "doc",
+ "by",
+ "formal",
+ "final",
+ "late",
+ "license",
+ "native",
+ "optional",
+ "sealed",
+ "see",
+ "shared",
+ "throws",
+ "tagged",
+ "variable"
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__ceylon_multi_line_api_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/**"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "ceylon_api_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__ceylon_single_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "",
+ "startSeq": "//"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "ceylon_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__ceylon_multi_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/*"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "ceylon_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__ceylon_string",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "\"",
+ "escapedBy": "\\",
+ "startSeq": "\""
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "ceylon_string",
+ "tokenScannerList": []
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/dart.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/dart.json
new file mode 100644
index 000000000..7945c08bb
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/dart.json
@@ -0,0 +1,320 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "dart",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "dart_default",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "dart_operator",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_CharacterRule",
+ "characterList": [
+ ";",
+ ".",
+ "\u003d",
+ "/",
+ "\\",
+ "+",
+ "-",
+ "*",
+ "\u003c",
+ "\u003e",
+ ":",
+ "?",
+ "!",
+ ",",
+ "|",
+ "\u0026",
+ "^",
+ "%",
+ "~"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "dart_bracket",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_CharacterRule",
+ "characterList": [
+ "(",
+ ")",
+ "{",
+ "}",
+ "[",
+ "]"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "dart_keyword",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "break",
+ "case",
+ "catch",
+ "class",
+ "const",
+ "continue",
+ "default",
+ "do",
+ "else",
+ "enum",
+ "extends",
+ "false",
+ "final",
+ "finally",
+ "for",
+ "if",
+ "in",
+ "is",
+ "new",
+ "null",
+ "rethrow",
+ "return",
+ "super",
+ "switch",
+ "this",
+ "throw",
+ "true",
+ "try",
+ "var",
+ "void",
+ "while",
+ "with"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "dart_keyword_1",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "abstract",
+ "as",
+ "assert",
+ "deferred",
+ "dynamic",
+ "export",
+ "external",
+ "factory",
+ "get",
+ "implements",
+ "import",
+ "library",
+ "operator",
+ "part",
+ "set",
+ "static",
+ "typedef"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "dart_keyword_2",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "async",
+ "async*",
+ "await",
+ "sync*",
+ "yield",
+ "yield*"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "dart_builtin_types",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "num",
+ "String",
+ "bool",
+ "int",
+ "double",
+ "List",
+ "Map"
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__dart_singlelinedoc_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "startSeq": "///"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "dart_doc",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "dart_doc_reference",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "]",
+ "startSeq": "["
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__dart_multilinedoc_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/**"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "dart_doc",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "dart_doc_reference",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "]",
+ "startSeq": "["
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__dart_singleline_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "startSeq": "//"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "dart_single_line_comment",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__dart_multiline_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/*"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "dart_multi_line_comment",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__dart_string",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\u0027",
+ "escapedBy": "\\",
+ "startSeq": "\u0027"
+ },
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\"",
+ "escapedBy": "\\",
+ "startSeq": "\""
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "dart_string",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "dart_string_inter",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "}",
+ "startSeq": "${"
+ },
+ {
+ "$gtype": "TokenScanner_PatternRule",
+ "containmentPattern": "\\w",
+ "startLength": 0,
+ "startPattern": "\\$"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/gls.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/gls.json
new file mode 100644
index 000000000..382298268
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/gls.json
@@ -0,0 +1,80 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "gls",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "__gls_default",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "gls_shdType",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "float",
+ "int",
+ "void",
+ "bool",
+ "mat2",
+ "mat3",
+ "mat4",
+ "vec2",
+ "vec3",
+ "vec4",
+ "ivec2",
+ "ivec3",
+ "ivec4",
+ "bvec2",
+ "bvec3",
+ "bvec4",
+ "sampler1D",
+ "sampler2D",
+ "sampler3D",
+ "samplerCube",
+ "sampler1DShadow",
+ "sampler2DShadow"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "gls_shdSemantic",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "attribute",
+ "in",
+ "out",
+ "inout"
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__gls_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "startSeq": "//"
+ }
+ ],
+ "tokenList": []
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/go.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/go.json
new file mode 100644
index 000000000..fce3b519c
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/go.json
@@ -0,0 +1,199 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "go",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "go_default",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "go_keyword",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "break",
+ "case",
+ "const",
+ "continue",
+ "default",
+ "defer",
+ "else",
+ "fallthrough",
+ "for",
+ "func",
+ "go",
+ "goto",
+ "if",
+ "import",
+ "interface",
+ "package",
+ "range",
+ "return",
+ "select",
+ "struct",
+ "switch",
+ "type",
+ "var"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "go_types",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "bool",
+ "byte",
+ "chan",
+ "complex64",
+ "complex128",
+ "error",
+ "float32",
+ "float64",
+ "func",
+ "int",
+ "int8",
+ "int16",
+ "int32",
+ "int64",
+ "map",
+ "rune",
+ "string",
+ "uint",
+ "uint8",
+ "uint16",
+ "uint32",
+ "uint64",
+ "uintptr"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "go_builtin_constants",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "iota",
+ "nil",
+ "true",
+ "false"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "go_builtin_functions",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "append",
+ "cap",
+ "close",
+ "complex",
+ "copy",
+ "delete",
+ "imag",
+ "len",
+ "make",
+ "new",
+ "panic",
+ "real",
+ "recover"
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__go_single_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "",
+ "startSeq": "//"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "go_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__go_multi_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/*"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "go_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__go_string",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\"",
+ "escapedBy": "\\",
+ "startSeq": "\""
+ },
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\u0027",
+ "escapedBy": "\\",
+ "startSeq": "\u0027"
+ },
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "`",
+ "startSeq": "`"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "go_string",
+ "tokenScannerList": []
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/groovy.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/groovy.json
new file mode 100644
index 000000000..d344452db
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/groovy.json
@@ -0,0 +1,209 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "groovy",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "groovy_default",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "groovy_keyword",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "abstract",
+ "as",
+ "assert",
+ "break",
+ "case",
+ "catch",
+ "class",
+ "const",
+ "continue",
+ "def",
+ "default",
+ "do",
+ "else",
+ "enum",
+ "extends",
+ "false",
+ "final",
+ "finally",
+ "for",
+ "goto",
+ "if",
+ "implements",
+ "import",
+ "in",
+ "instanceof",
+ "interface",
+ "native",
+ "new",
+ "null",
+ "package",
+ "private",
+ "protected",
+ "public",
+ "static",
+ "strictfp",
+ "super",
+ "switch",
+ "synchronized",
+ "this",
+ "threadsafe",
+ "throw",
+ "throws",
+ "transient",
+ "true",
+ "try",
+ "void",
+ "volatile",
+ "while",
+ "return"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "groovy_builtin_type",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "boolean",
+ "byte",
+ "char",
+ "short",
+ "int",
+ "long",
+ "double",
+ "float"
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__groovy_apidoc",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/**"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "groovy_api_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__groovy_multiline_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/*"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "groovy_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__groovy_singleline_comment",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "groovy_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__groovy_string",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\"",
+ "escapedBy": "\\",
+ "startSeq": "\""
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "groovy_string",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "groovy_string_inter",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "}",
+ "startSeq": "${"
+ },
+ {
+ "$gtype": "TokenScanner_PatternRule",
+ "containmentPattern": "\\w",
+ "startLength": 0,
+ "startPattern": "\\$"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__groovy_character",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\u0027",
+ "escapedBy": "\\",
+ "startSeq": "\u0027"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "groovy_string",
+ "tokenScannerList": []
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/java.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/java.json
new file mode 100644
index 000000000..979e5f074
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/java.json
@@ -0,0 +1,253 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "java",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "java_default",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "java_operator",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_CharacterRule",
+ "characterList": [
+ ";",
+ ".",
+ "\u003d",
+ "/",
+ "\\",
+ "+",
+ "-",
+ "*",
+ "\u003c",
+ "\u003e",
+ ":",
+ "?",
+ "!",
+ ",",
+ "|",
+ "\u0026",
+ "^",
+ "%",
+ "~"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "java_bracket",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_CharacterRule",
+ "characterList": [
+ "(",
+ ")",
+ "{",
+ "}",
+ "[",
+ "]"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "java_keyword",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "abstract",
+ "break",
+ "case",
+ "catch",
+ "class",
+ "const",
+ "continue",
+ "default",
+ "do",
+ "else",
+ "extends",
+ "final",
+ "finally",
+ "for",
+ "goto",
+ "if",
+ "implements",
+ "import",
+ "instanceof",
+ "interface",
+ "native",
+ "new",
+ "package",
+ "private",
+ "protected",
+ "public",
+ "static",
+ "super",
+ "switch",
+ "synchronized",
+ "this",
+ "throw",
+ "throws",
+ "transient",
+ "try",
+ "volatile",
+ "while",
+ "interface",
+ "enum",
+ "return"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "java_buitin_type",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "void",
+ "boolean",
+ "char",
+ "byte",
+ "short",
+ "strictfp",
+ "int",
+ "long",
+ "float",
+ "double"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "java_constant",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "true",
+ "false",
+ "null"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "java_annotation",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_PatternRule",
+ "containmentPattern": "\\w",
+ "startLength": 0,
+ "startPattern": "@"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__java_multi_line_api_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/**"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "java_apidoc",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__java_single_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "",
+ "startSeq": "//"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "java_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__java_multi_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/*"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "java_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__java_string",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\u0027",
+ "escapedBy": "\\",
+ "startSeq": "\u0027"
+ },
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\"",
+ "escapedBy": "\\",
+ "startSeq": "\""
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "java_string",
+ "tokenScannerList": []
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/js.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/js.json
new file mode 100644
index 000000000..67327d94b
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/js.json
@@ -0,0 +1,170 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "js",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "js_default",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "js_operator",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_CharacterRule",
+ "characterList": [
+ ";",
+ ".",
+ "\u003d",
+ "/",
+ "\\",
+ "+",
+ "-",
+ "*",
+ "\u003c",
+ "\u003e",
+ ":",
+ "?",
+ "!",
+ ",",
+ "|",
+ "\u0026",
+ "^",
+ "%",
+ "~"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "js_bracket",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_CharacterRule",
+ "characterList": [
+ "(",
+ ")",
+ "{",
+ "}",
+ "[",
+ "]"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "js_keyword",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "break",
+ "case",
+ "catch",
+ "continue",
+ "debugger",
+ "default",
+ "delete",
+ "do",
+ "else",
+ "finally",
+ "for",
+ "function",
+ "if",
+ "in",
+ "instanceof",
+ "new",
+ "return",
+ "switch",
+ "this",
+ "throw",
+ "try",
+ "typeof",
+ "var",
+ "void",
+ "while",
+ "with"
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__js_single_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "",
+ "startSeq": "//"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "js_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__js_multi_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/*"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "js_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__js_string",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\u0027",
+ "escapedBy": "\\",
+ "startSeq": "\u0027"
+ },
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\"",
+ "escapedBy": "\\",
+ "startSeq": "\""
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "js_string",
+ "tokenScannerList": []
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/kotlin.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/kotlin.json
new file mode 100644
index 000000000..60b219ded
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/kotlin.json
@@ -0,0 +1,181 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "kotlin",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "kotlin_default",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "kotlin_keyword",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "break",
+ "continue",
+ "return",
+ "if",
+ "else",
+ "when",
+ "do",
+ "for",
+ "while",
+ "as",
+ "in",
+ "is",
+ "by",
+ "get",
+ "set",
+ "out",
+ "super",
+ "this",
+ "This",
+ "where",
+ "try",
+ "catch",
+ "finally",
+ "throw",
+ "import",
+ "package",
+ "annotation",
+ "companion",
+ "enum",
+ "inner",
+ "internal",
+ "private",
+ "protected",
+ "public",
+ "abstract",
+ "final",
+ "open",
+ "override",
+ "sealed",
+ "vararg",
+ "dynamic",
+ "class",
+ "object",
+ "interface",
+ "trait",
+ "fun",
+ "val",
+ "var",
+ "constructor",
+ "init",
+ "typealias",
+ "data",
+ "inline",
+ "reified",
+ "native",
+ "synchronized",
+ "transient",
+ "volatile"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "kotlin_literals",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "true",
+ "false",
+ "null"
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__kotlin_multi_line_api_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/**"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "kotlin_api_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__kotlin_single_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "",
+ "startSeq": "//"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "kotlin_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__kotlin_multi_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/*"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "kotlin_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__kotlin_string",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\"",
+ "escapedBy": "\\",
+ "startSeq": "\""
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "kotlin_string",
+ "tokenScannerList": []
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/lua.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/lua.json
new file mode 100644
index 000000000..5f273e98d
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/lua.json
@@ -0,0 +1,92 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "lua",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "lua_default",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "lua_keyword",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "function",
+ "end",
+ "for",
+ "if"
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__lua_single_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "",
+ "startSeq": "--"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "lua_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__lua_multi_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "]]--",
+ "startSeq": "--[["
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "lua_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__lua_string",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "\"",
+ "startSeq": "\""
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "lua_string",
+ "tokenScannerList": []
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/php.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/php.json
new file mode 100644
index 000000000..f97946dbd
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/php.json
@@ -0,0 +1,264 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "php",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "php_default",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "php_keyword",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "abstract",
+ "and",
+ "as",
+ "break",
+ "callable",
+ "case",
+ "catch",
+ "class",
+ "clone",
+ "const",
+ "continue",
+ "declare",
+ "default",
+ "do",
+ "else",
+ "elseif",
+ "enddeclare",
+ "endfor",
+ "endforeach",
+ "endif",
+ "endswitch",
+ "endwhile",
+ "extends",
+ "final",
+ "finally",
+ "for",
+ "foreach",
+ "function",
+ "global",
+ "goto",
+ "if",
+ "implements",
+ "instanceof",
+ "insteadof",
+ "interface",
+ "namespace",
+ "new",
+ "or",
+ "private",
+ "protected",
+ "public",
+ "return",
+ "static",
+ "switch",
+ "throw",
+ "trait",
+ "try"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "php_operator",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_CharacterRule",
+ "characterList": [
+ ";",
+ ".",
+ "\u003d",
+ "/",
+ "\\",
+ "+",
+ "-",
+ "*",
+ "\u003c",
+ "\u003e",
+ ":",
+ "?",
+ "!",
+ ",",
+ "|",
+ "\u0026",
+ "^",
+ "%",
+ "~"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "php_bracket",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_CharacterRule",
+ "characterList": [
+ "(",
+ ")",
+ "{",
+ "}",
+ "[",
+ "]"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "php_builtin_functions",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "__halt_compiler",
+ "array",
+ "die",
+ "echo",
+ "empty",
+ "eval",
+ "exit",
+ "include",
+ "include_once",
+ "isset",
+ "list",
+ "print",
+ "unset",
+ "use",
+ "var",
+ "while",
+ "xor",
+ "require",
+ "require_once",
+ "yield"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "php_builtin_classes",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "ArrayAccess",
+ "Closure",
+ "ErrorException",
+ "Exception",
+ "Generator",
+ "Iterator",
+ "IteratorAggregate",
+ "Serializable",
+ "Traversable",
+ "stdClass"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "php_compile_constants",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "__CLASS__",
+ "__DIR__",
+ "__FILE__",
+ "__FUNCTION__",
+ "__LINE__",
+ "__METHOD__",
+ "__NAMESPACE__ ",
+ "__TRAIT__"
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__php_multiline_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/*"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "php_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__php_string",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\"",
+ "escapedBy": "\\",
+ "startSeq": "\""
+ },
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\u0027",
+ "escapedBy": "\\",
+ "startSeq": "\u0027"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "php_string",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "php_string_inter",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "}",
+ "startSeq": "${"
+ },
+ {
+ "$gtype": "TokenScanner_PatternRule",
+ "containmentPattern": "\\w",
+ "startLength": 0,
+ "startPattern": "\\$"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/py.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/py.json
new file mode 100644
index 000000000..74f5a6344
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/py.json
@@ -0,0 +1,176 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "py",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "python_default",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "python_operator",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_CharacterRule",
+ "characterList": [
+ ";",
+ ".",
+ "\u003d",
+ "/",
+ "\\",
+ "+",
+ "-",
+ "*",
+ "\u003c",
+ "\u003e",
+ ":",
+ "?",
+ "!",
+ ",",
+ "|",
+ "\u0026",
+ "^",
+ "%",
+ "~"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "python_bracket",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_CharacterRule",
+ "characterList": [
+ "(",
+ ")",
+ "{",
+ "}",
+ "[",
+ "]"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "python_keyword",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "and",
+ "as",
+ "assert",
+ "break",
+ "class",
+ "continue",
+ "def",
+ "del",
+ "elif",
+ "else",
+ "except",
+ "exec",
+ "finally",
+ "for",
+ "from",
+ "global",
+ "if",
+ "import",
+ "in",
+ "is",
+ "lambda",
+ "not",
+ "or",
+ "pass",
+ "print",
+ "raise",
+ "return",
+ "try",
+ "while",
+ "with",
+ "yield",
+ "return"
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__python_multiline_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "\u0027\u0027\u0027",
+ "startSeq": "\u0027\u0027\u0027"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "python_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__python_singleline_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "",
+ "startSeq": "#"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "python_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__python_string",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\"",
+ "escapedBy": "\\",
+ "startSeq": "\""
+ },
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\u0027",
+ "escapedBy": "\\",
+ "startSeq": "\u0027"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "phyton_string",
+ "tokenScannerList": []
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/rust.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/rust.json
new file mode 100644
index 000000000..1257a307c
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/rust.json
@@ -0,0 +1,222 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "rust",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "rust_default",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "rust_function",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "fn"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "rust_type",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "type"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "rust_keyword",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "abstract",
+ "alignof",
+ "as",
+ "become",
+ "box",
+ "break",
+ "const",
+ "continue",
+ "crate",
+ "do",
+ "else",
+ "enum",
+ "extern",
+ "final",
+ "for",
+ "if",
+ "impl",
+ "in",
+ "let",
+ "loop",
+ "macro",
+ "match",
+ "mod",
+ "move",
+ "mut",
+ "offsetof",
+ "override",
+ "priv",
+ "proc",
+ "pub",
+ "pure",
+ "ref",
+ "return",
+ "sizeof",
+ "static",
+ "struct",
+ "super",
+ "trait",
+ "typeof",
+ "unsafe",
+ "unsized",
+ "use",
+ "virtual",
+ "where",
+ "while",
+ "yield"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "rust_types",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "bool",
+ "isize",
+ "usize",
+ "i8",
+ "i16",
+ "i32",
+ "i64",
+ "u8",
+ "u16",
+ "u32",
+ "u64",
+ "f32",
+ "f64",
+ "char",
+ "str"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "rust_self",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "self",
+ "Self"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "rust_constants",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "true",
+ "false"
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__rust_single_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "",
+ "startSeq": "//"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "rust_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__rust_multi_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/*"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "rust_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__rust_string",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\"",
+ "escapedBy": "\\",
+ "startSeq": "\""
+ },
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\u0027",
+ "escapedBy": "\\",
+ "startSeq": "\u0027"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "rust_string",
+ "tokenScannerList": []
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/swift.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/swift.json
new file mode 100644
index 000000000..e6c9aa388
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/swift.json
@@ -0,0 +1,217 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "swift",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "swift_default",
+ "tokenScannerList": []
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "swift_keyword",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "as",
+ "break",
+ "case",
+ "catch",
+ "class",
+ "continue",
+ "convenience",
+ "default",
+ "defer",
+ "deinit",
+ "didSet",
+ "do",
+ "dynamic",
+ "else",
+ "extension",
+ "fallthrough",
+ "final",
+ "for",
+ "func",
+ "get",
+ "guard",
+ "if",
+ "import",
+ "in",
+ "infix",
+ "init",
+ "inout",
+ "internal",
+ "is",
+ "lazy",
+ "let",
+ "mutating",
+ "nil",
+ "operator",
+ "optional",
+ "override",
+ "postfix",
+ "prefix",
+ "private",
+ "protocol",
+ "public",
+ "repeat",
+ "required",
+ "return",
+ "self",
+ "set",
+ "static",
+ "subscript",
+ "super",
+ "switch",
+ "throws",
+ "try",
+ "typealias",
+ "unowned",
+ "var",
+ "weak",
+ "where",
+ "while",
+ "willSet",
+ "struct",
+ "enum"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "swift_builtin_type",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_Keyword",
+ "keywordList": [
+ "Int",
+ "Bool"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "swift_operator",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_CharacterRule",
+ "characterList": [
+ "~",
+ "!",
+ "%",
+ "^",
+ "\u0026",
+ "*",
+ "-",
+ "+",
+ "\u003d",
+ "|",
+ "/",
+ ".",
+ "\u003c",
+ "\u003e",
+ "?"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "swift_number",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_PatternRule",
+ "containmentPattern": "[0-9|\\.|e|E|-]",
+ "startLength": 0,
+ "startPattern": "[0-9]"
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "swift_attribute",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_PatternRule",
+ "containmentPattern": "[\\w]",
+ "startLength": 0,
+ "startPattern": "@"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__swift_single_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "",
+ "startSeq": "//"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "swift_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__swift_multi_line_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "*/",
+ "startSeq": "/*"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "swift_doc_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__swift_string",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "\"",
+ "escapedBy": "\\",
+ "startSeq": "\""
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "swift_string",
+ "tokenScannerList": []
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/xml.json b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/xml.json
new file mode 100644
index 000000000..14c9aaccf
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src-gen/org/eclipse/fx/code/editor/ldef/langs/xml.json
@@ -0,0 +1,170 @@
+{
+ "$gtype": "LanguageDef",
+ "fileSuffix": "xml",
+ "partitionList": [
+ {
+ "$gtype": "Partition",
+ "name": "__dftl_partition_content_type",
+ "ruleList": [],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "xml_default",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__xml_decl",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_SingleLine",
+ "endSeq": "?\u003e",
+ "startSeq": "\u003c?xml"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "xml_declaration",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__xml_cdata",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "]]\u003e",
+ "startSeq": "\u003c![CDATA["
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "xml_cdata",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__xml_pi",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "?\u003e",
+ "startSeq": "\u003c?"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "xml_pi",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__xml_comment",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "--\u003e",
+ "startSeq": "\u003c!--"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "xml_comment",
+ "tokenScannerList": []
+ }
+ ]
+ },
+ {
+ "$gtype": "Partition",
+ "name": "__xml_tag",
+ "ruleList": [
+ {
+ "$gtype": "PartitionRule_MultiLine",
+ "endSeq": "\u003e",
+ "startSeq": "\u003c"
+ }
+ ],
+ "tokenList": [
+ {
+ "$gtype": "Token",
+ "defaultToken": true,
+ "name": "xml_tag",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_PatternRule",
+ "containmentPattern": "[\\w|-]",
+ "startLength": 2,
+ "startPattern": "\u003c/"
+ },
+ {
+ "$gtype": "TokenScanner_PatternRule",
+ "containmentPattern": "[\\w|-]",
+ "startLength": 0,
+ "startPattern": "\u003c"
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "xml_property_value",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "\"",
+ "startSeq": "\""
+ },
+ {
+ "$gtype": "TokenScanner_SingleLineRule",
+ "endSeq": "\u0027",
+ "startSeq": "\u0027"
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "xml_equals",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_CharacterRule",
+ "characterList": [
+ "\u003d"
+ ]
+ }
+ ]
+ },
+ {
+ "$gtype": "Token",
+ "defaultToken": false,
+ "name": "xml_property_name",
+ "tokenScannerList": [
+ {
+ "$gtype": "TokenScanner_PatternRule",
+ "containmentPattern": "\\w",
+ "startLength": 0,
+ "startPattern": "\\w"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/asciidoc/highlight.css b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/adoc.css
index d98894ffb..d98894ffb 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/asciidoc/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/adoc.css
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/asciidoc/asciidoc.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/adoc.ldef
index 354346bed..047bcb59a 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/asciidoc/asciidoc.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/adoc.ldef
@@ -106,8 +106,8 @@ adoc {
}
integration {
javafx {
- java "org.eclipse.fx.code.editor.ldef.langs.fx.asciidoc" {
- project : "org.eclipse.fx.code.editor.ldef.langs.fx"
+ java "org.eclipse.fx.code.editor.langs.codegen.fx.asciidoc" {
+ project : "org.eclipse.fx.code.editor.langs.codegen.fx"
}
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/ceylon/highlight.css b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/ceylon.css
index 82f8f4112..82f8f4112 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/ceylon/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/ceylon.css
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/ceylon/ceylon.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/ceylon.ldef
index a10ca4592..077f578c6 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/ceylon/ceylon.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/ceylon.ldef
@@ -54,8 +54,8 @@ ceylon {
}
integration {
javafx {
- java "org.eclipse.fx.code.editor.ldef.langs.fx.ceylon" {
- project : "org.eclipse.fx.code.editor.ldef.langs.fx"
+ java "org.eclipse.fx.code.editor.langs.codegen.fx.ceylon" {
+ project : "org.eclipse.fx.code.editor.langs.codegen.fx"
}
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/dart/highlight.css b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/dart.css
index bcb0c717d..bcb0c717d 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/dart/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/dart.css
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/dart/dart.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/dart.ldef
index d58c254e7..8cb2a59b9 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/dart/dart.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/dart.ldef
@@ -74,8 +74,8 @@ dart {
}
integration {
javafx {
- java "org.eclipse.fx.code.editor.ldef.langs.fx.dart" {
- project : "org.eclipse.fx.code.editor.ldef.langs.fx"
+ java "org.eclipse.fx.code.editor.langs.codegen.fx.dart" {
+ project : "org.eclipse.fx.code.editor.langs.codegen.fx"
}
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/gls/gls.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/gls.ldef
index a2c8b5300..a2c8b5300 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/gls/gls.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/gls.ldef
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/go/highlight.css b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/go.css
index 17fb7ead0..17fb7ead0 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/go/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/go.css
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/go/go.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/go.ldef
index 0e5a12440..78654bcb8 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/go/go.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/go.ldef
@@ -58,8 +58,8 @@ go {
}
integration {
javafx {
- java "org.eclipse.fx.code.editor.ldef.langs.fx.go" {
- project : "org.eclipse.fx.code.editor.ldef.langs.fx"
+ java "org.eclipse.fx.code.editor.langs.codegen.fx.go" {
+ project : "org.eclipse.fx.code.editor.langs.codegen.fx"
}
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/groovy/highlight.css b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/groovy.css
index 8ea161a8c..8ea161a8c 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/groovy/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/groovy.css
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/groovy/groovy.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/groovy.ldef
index 9ff6bfd1f..27bcf16ba 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/groovy/groovy.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/groovy.ldef
@@ -63,8 +63,8 @@ groovy {
}
integration {
javafx {
- java "org.eclipse.fx.code.editor.ldef.langs.fx.groovy" {
- project : "org.eclipse.fx.code.editor.ldef.langs.fx"
+ java "org.eclipse.fx.code.editor.langs.codegen.fx.groovy" {
+ project : "org.eclipse.fx.code.editor.langs.codegen.fx"
}
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/java/highlight.css b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/java.css
index 0d3dc5568..0d3dc5568 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/java/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/java.css
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/java/java.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/java.ldef
index 7b0f153a8..3dbe0851f 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/java/java.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/java.ldef
@@ -58,8 +58,8 @@ package org.eclipse.fx.code.editor.ldef.langs
}
integration {
javafx {
- java "org.eclipse.fx.code.editor.ldef.langs.fx.java" {
- project : "org.eclipse.fx.code.editor.ldef.langs.fx"
+ java "org.eclipse.fx.code.editor.langs.codegen.fx.java" {
+ project : "org.eclipse.fx.code.editor.langs.codegen.fx"
}
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/js/highlight.css b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/js.css
index 935bf863d..935bf863d 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/js/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/js.css
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/js/js.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/js.ldef
index a7cd61780..710517f45 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/js/js.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/js.ldef
@@ -44,8 +44,8 @@ js {
}
integration {
javafx {
- java "org.eclipse.fx.code.editor.ldef.langs.fx.js" {
- project : "org.eclipse.fx.code.editor.ldef.langs.fx"
+ java "org.eclipse.fx.code.editor.langs.codegen.fx.js" {
+ project : "org.eclipse.fx.code.editor.langs.codegen.fx"
}
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/kotlin/highlight.css b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/kotlin.css
index b25d35036..b25d35036 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/kotlin/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/kotlin.css
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/kotlin/kotlin.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/kotlin.ldef
index 6b6efaaa4..896c1c60f 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/kotlin/kotlin.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/kotlin.ldef
@@ -53,8 +53,8 @@ kotlin {
}
integration {
javafx {
- java "org.eclipse.fx.code.editor.ldef.langs.fx.kotlin" {
- project : "org.eclipse.fx.code.editor.ldef.langs.fx"
+ java "org.eclipse.fx.code.editor.langs.codegen.fx.kotlin" {
+ project : "org.eclipse.fx.code.editor.langs.codegen.fx"
}
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/lua/highlight.css b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/lua.css
index f4b1b2334..f4b1b2334 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/lua/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/lua.css
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/lua/lua.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/lua.ldef
index f43a8fb65..156d63789 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/lua/lua.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/lua.ldef
@@ -31,8 +31,8 @@ lua {
}
integration {
javafx {
- java "org.eclipse.fx.code.editor.ldef.langs.fx.lua" {
- project : "org.eclipse.fx.code.editor.ldef.langs.fx"
+ java "org.eclipse.fx.code.editor.langs.codegen.fx.lua" {
+ project : "org.eclipse.fx.code.editor.langs.codegen.fx"
}
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/php/highlight.css b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/php.css
index 10e3482db..10e3482db 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/php/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/php.css
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/php/php.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/php.ldef
index 726999f6a..4033ba69b 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/php/php.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/php.ldef
@@ -414,8 +414,8 @@ php {
}
integration {
javafx {
- java "org.eclipse.fx.code.editor.ldef.langs.fx.php" {
- project : "org.eclipse.fx.code.editor.ldef.langs.fx"
+ java "org.eclipse.fx.code.editor.langs.codegen.fx.php" {
+ project : "org.eclipse.fx.code.editor.langs.codegen.fx"
}
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/python/highlight.css b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/python.css
index 3924a5af1..3924a5af1 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/python/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/python.css
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/python/python.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/python.ldef
index 9792d64f8..f9ac7a4a7 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/python/python.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/python.ldef
@@ -41,8 +41,8 @@ py {
}
integration {
javafx {
- java "org.eclipse.fx.code.editor.ldef.langs.fx.python" {
- project : "org.eclipse.fx.code.editor.ldef.langs.fx"
+ java "org.eclipse.fx.code.editor.langs.codegen.fx.python" {
+ project : "org.eclipse.fx.code.editor.langs.codegen.fx"
}
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/rust/highlight.css b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/rust.css
index b1f910d23..b1f910d23 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/rust/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/rust.css
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/rust/rust.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/rust.ldef
index 48394764e..01143db45 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/rust/rust.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/rust.ldef
@@ -64,8 +64,8 @@ rust {
}
integration {
javafx {
- java "org.eclipse.fx.code.editor.ldef.langs.fx.rust" {
- project : "org.eclipse.fx.code.editor.ldef.langs.fx"
+ java "org.eclipse.fx.code.editor.langs.codegen.fx.rust" {
+ project : "org.eclipse.fx.code.editor.langs.codegen.fx"
}
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/swift/highlight.css b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/swift.css
index 53c14692f..53c14692f 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/swift/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/swift.css
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/swift/swift.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/swift.ldef
index f0163ca79..01d8723e5 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/swift/swift.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/swift.ldef
@@ -61,8 +61,8 @@ swift {
}
integration {
javafx {
- java "org.eclipse.fx.code.editor.ldef.langs.fx.swift" {
- project : "org.eclipse.fx.code.editor.ldef.langs.fx"
+ java "org.eclipse.fx.code.editor.langs.codegen.fx.swift" {
+ project : "org.eclipse.fx.code.editor.langs.codegen.fx"
}
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/xml/highlight.css b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/xml.css
index 46c13c74c..46c13c74c 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/xml/highlight.css
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/xml.css
diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/xml/xml.ldef b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/xml.ldef
index 8ffbcfe68..71ea727bd 100644
--- a/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/xml/xml.ldef
+++ b/bundles/code/org.eclipse.fx.code.editor.langs/src/org/eclipse/fx/code/editor/ldef/langs/xml.ldef
@@ -51,8 +51,8 @@ xml {
}
integration {
javafx {
- java "org.eclipse.fx.code.editor.ldef.langs.fx.xml" {
- project : "org.eclipse.fx.code.editor.ldef.langs.fx"
+ java "org.eclipse.fx.code.editor.langs.codegen.fx.xml" {
+ project : "org.eclipse.fx.code.editor.langs.codegen.fx"
}
}
}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/META-INF/MANIFEST.MF
deleted file mode 100644
index 756d20414..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Language definitions for JavaFX editors
-Bundle-SymbolicName: org.eclipse.fx.code.editor.ldef.langs.fx
-Bundle-Version: 2.2.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.fx.code.editor.ldef.langs.fx.asciidoc;version="2.2.0",
- org.eclipse.fx.code.editor.ldef.langs.fx.ceylon;version="2.2.0";x-internal:=true,
- org.eclipse.fx.code.editor.ldef.langs.fx.dart;version="2.2.0";x-internal:=true,
- org.eclipse.fx.code.editor.ldef.langs.fx.go;version="2.2.0";x-internal:=true,
- org.eclipse.fx.code.editor.ldef.langs.fx.groovy;version="2.2.0";x-internal:=true,
- org.eclipse.fx.code.editor.ldef.langs.fx.java;version="2.2.0";x-internal:=true,
- org.eclipse.fx.code.editor.ldef.langs.fx.js;version="2.2.0";x-internal:=true,
- org.eclipse.fx.code.editor.ldef.langs.fx.kotlin;version="2.2.0";x-internal:=true,
- org.eclipse.fx.code.editor.ldef.langs.fx.lua;version="2.2.0",
- org.eclipse.fx.code.editor.ldef.langs.fx.php;version="2.2.0",
- org.eclipse.fx.code.editor.ldef.langs.fx.python;version="2.2.0";x-internal:=true,
- org.eclipse.fx.code.editor.ldef.langs.fx.rust;version="2.2.0";x-internal:=true,
- org.eclipse.fx.code.editor.ldef.langs.fx.swift;version="2.2.0";x-internal:=true,
- org.eclipse.fx.code.editor.ldef.langs.fx.xml;version="2.2.0";x-internal:=true
-Bundle-Vendor: Eclipse.org
-Import-Package: org.eclipse.fx.text.rules
-Require-Bundle: org.eclipse.text;bundle-version="3.5.400",
- org.eclipse.fx.text;bundle-version="2.2.0",
- org.eclipse.fx.text.ui;bundle-version="2.2.0",
- org.eclipse.fx.text.compat;bundle-version="2.2.0"
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/about.html b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/about.html
deleted file mode 100644
index c258ef55d..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.settings/ca.ecliptical.pde.ds.prefs b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.settings/ca.ecliptical.pde.ds.prefs
deleted file mode 100644
index ab9ef4588..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.settings/ca.ecliptical.pde.ds.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-enabled=true
-path=OSGI-INF/services
-validationErrorLevel=0
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/META-INF/MANIFEST.MF
deleted file mode 100644
index 953a18d87..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Integration of DSL models into OSGi
-Bundle-SymbolicName: org.eclipse.fx.code.editor.ldef.langs.text
-Bundle-Version: 2.2.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.fx.code.editor;version="2.2.0",
- org.eclipse.fx.code.editor.ldef;version="2.2.0",
- org.eclipse.fx.code.editor.ldef.lDef;version="2.2.0",
- org.eclipse.fx.code.editor.ldef.text;version="2.2.0",
- org.eclipse.fx.code.editor.services;version="2.2.0",
- org.eclipse.fx.core;version="2.2.0",
- org.osgi.service.component.annotations;resolution:=optional
-Service-Component: OSGI-INF/services/org.eclipse.fx.code.editor.ldef.langs.text.LDefDefaultModelProvider.xml
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.emf.common;bundle-version="2.11.0",
- org.eclipse.emf.ecore;bundle-version="2.11.0"
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.langs.text.LDefDefaultModelProvider.xml b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.langs.text.LDefDefaultModelProvider.xml
deleted file mode 100644
index 3b926754c..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.langs.text.LDefDefaultModelProvider.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.fx.code.editor.ldef.langs.text.LDefDefaultModelProvider">
- <implementation class="org.eclipse.fx.code.editor.ldef.langs.text.LDefDefaultModelProvider"/>
- <service>
- <provide interface="org.eclipse.fx.code.editor.ldef.text.LDefModelProvider"/>
- <provide interface="org.eclipse.fx.code.editor.ldef.langs.text.LDefDefaultModelProvider"/>
- </service>
-</scr:component> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/about.html b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/about.html
deleted file mode 100644
index c258ef55d..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/pom.xml b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/pom.xml
deleted file mode 100644
index 877e34357..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <name>e(fx)clipse - Runtime - Code - Model loader for default languages</name>
- <groupId>org.eclipse.fx.runtime</groupId>
- <artifactId>org.eclipse.fx.code.editor.ldef.langs.text</artifactId>
- <packaging>eclipse-plugin</packaging>
-
- <parent>
- <groupId>org.eclipse.fx</groupId>
- <artifactId>releng</artifactId>
- <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>2.2.0-SNAPSHOT</version>
- </parent>
-
- <build>
- <resources>
- <!-- to ensure that the feature lookup of the ui test works -->
- <resource>
- <directory>.</directory>
- <includes>
- <include>META-INF/</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/src/org/eclipse/fx/code/editor/ldef/langs/text/LDefDefaultModelProvider.java b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/src/org/eclipse/fx/code/editor/ldef/langs/text/LDefDefaultModelProvider.java
deleted file mode 100644
index 192b8548e..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/src/org/eclipse/fx/code/editor/ldef/langs/text/LDefDefaultModelProvider.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.eclipse.fx.code.editor.ldef.langs.text;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.fx.code.editor.Input;
-import org.eclipse.fx.code.editor.ldef.LDefStandaloneSetup;
-import org.eclipse.fx.code.editor.ldef.lDef.LanguageDef;
-import org.eclipse.fx.code.editor.ldef.lDef.Root;
-import org.eclipse.fx.code.editor.ldef.text.LDefModelProvider;
-import org.eclipse.fx.code.editor.services.URIProvider;
-import org.osgi.service.component.annotations.Component;
-
-@Component(service={LDefModelProvider.class,LDefDefaultModelProvider.class})
-public class LDefDefaultModelProvider implements LDefModelProvider {
- private final Map<String,URI> definitionURI = new HashMap<>();
- private final Map<String,LanguageDef> definitionCache = new HashMap<>();
- private ResourceSetImpl rs;
-
- public LDefDefaultModelProvider() {
- LDefStandaloneSetup.doSetup();
- rs = new ResourceSetImpl();
-
- register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/dart/dart.ldef"),"dart");
- register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/js/js.ldef"),"js");
- register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/java/java.ldef"),"java");
- register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/xml/xml.ldef"),"xml");
- register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/go/go.ldef"),"go");
- register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/rust/rust.ldef"),"rust");
- register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/swift/swift.ldef"),"swift");
- register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/groovy/groovy.ldef"),"groovy");
- register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/python/python.ldef"),"python");
- register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/php/php.ldef"),"php");
- register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/asciidoc/asciidoc.ldef"),"adoc");
- register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/ceylon/ceylon.ldef"),"ceylon");
- register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/kotlin/kotlin.ldef"),"kotlin");
- register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.langs/org/eclipse/fx/code/editor/ldef/langs/lua/lua.ldef"),"lua");
- }
-
- private void register(URI uri, String fileSuffix) {
- definitionURI.put(fileSuffix, uri);
- }
-
- @Override
- public boolean applies(Input<?> input) {
- if( input instanceof URIProvider ) {
- String uri = ((URIProvider) input).getURI();
- String[] parts = uri.split("/");
- String lastSegment = parts[parts.length-1];
- int idx = lastSegment.lastIndexOf('.');
- if( idx != -1 ) {
- return definitionURI.containsKey(lastSegment.substring(idx+1));
- }
- }
- return false;
- }
-
- @Override
- public LanguageDef getModel(Input<?> input) {
- if( input instanceof URIProvider ) {
- String uri = ((URIProvider) input).getURI();
- String[] parts = uri.split("/");
- String lastSegment = parts[parts.length-1];
- int idx = lastSegment.lastIndexOf('.');
- if( idx != -1 ) {
- return getModelByExtension(lastSegment.substring(idx+1));
- }
- }
- return null;
- }
-
- public LanguageDef getModelByExtension(String extension) {
- LanguageDef def = definitionCache.get(extension);
-
- if( def == null ) {
- Resource resource = rs.getResource(definitionURI.get(extension), true);
- def = ((Root) resource.getContents().get(0)).getLanguageDefinition();
- definitionCache.put(extension, def);
- }
-
- return def;
- }
-}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.project b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.project
deleted file mode 100644
index ec5fe9b6c..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.fx.code.editor.ldef.langs.themes</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ds.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.settings/ca.ecliptical.pde.ds.prefs b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.settings/ca.ecliptical.pde.ds.prefs
deleted file mode 100644
index ab9ef4588..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/.settings/ca.ecliptical.pde.ds.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-enabled=true
-path=OSGI-INF/services
-validationErrorLevel=0
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/META-INF/MANIFEST.MF
deleted file mode 100644
index de4ea0dea..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JavaFX editor themes for basic languages
-Bundle-SymbolicName: org.eclipse.fx.code.editor.ldef.langs.themes
-Bundle-Version: 2.2.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/services/org.eclipse.fx.code.editor.ldef.langs.themes.DefaultEditorStylesheets.xml
-Import-Package: org.eclipse.fx.ui.services.theme;version="2.2.0",
- org.osgi.service.component.annotations;resolution:=optional
-Require-Bundle: org.eclipse.jdt.annotation;resolution:=optional
-Bundle-Vendor: Eclipse.org
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/about.html b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/about.html
deleted file mode 100644
index c258ef55d..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/build.properties b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/build.properties
deleted file mode 100644
index 626772844..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/,\
- about.html
-source.. = src/
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/pom.xml b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/pom.xml
deleted file mode 100644
index 7fcbaad75..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <name>e(fx)clipse - Runtime - Code - JavaFX themes for languages</name>
- <groupId>org.eclipse.fx.runtime</groupId>
- <artifactId>org.eclipse.fx.code.editor.ldef.langs.themes</artifactId>
- <packaging>eclipse-plugin</packaging>
-
- <parent>
- <groupId>org.eclipse.fx</groupId>
- <artifactId>releng</artifactId>
- <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
- <version>2.2.0-SNAPSHOT</version>
- </parent>
-
- <build>
- <resources>
- <!-- to ensure that the feature lookup of the ui test works -->
- <resource>
- <directory>.</directory>
- <includes>
- <include>META-INF/</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.project b/bundles/code/org.eclipse.fx.code.editor.ldef.langs/bin/.project
index ad3c642d7..555d1b045 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs.text/.project
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef.langs/bin/.project
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.fx.code.editor.ldef.langs.text</name>
+ <name>org.eclipse.fx.code.editor.ldef.langs</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
@@ -29,5 +34,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.classpath b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.classpath
deleted file mode 100644
index eca7bdba8..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.gitignore b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.gitignore
deleted file mode 100644
index 09e3bc9b2..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.settings/ca.ecliptical.pde.ds.prefs b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.settings/ca.ecliptical.pde.ds.prefs
deleted file mode 100644
index ab9ef4588..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.settings/ca.ecliptical.pde.ds.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-enabled=true
-path=OSGI-INF/services
-validationErrorLevel=0
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.settings/org.eclipse.jdt.core.prefs b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/META-INF/MANIFEST.MF
deleted file mode 100644
index 36188e14b..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JavaFX Editor configurations based on LDef DSL
-Bundle-SymbolicName: org.eclipse.fx.code.editor.ldef.text.fx
-Bundle-Version: 2.2.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Import-Package: javax.inject,
- org.eclipse.fx.code.editor;version="2.2.0",
- org.eclipse.fx.code.editor.fx.services;version="2.2.0",
- org.eclipse.fx.code.editor.ldef.lDef;version="2.2.0",
- org.eclipse.fx.code.editor.ldef.text;version="2.2.0",
- org.eclipse.fx.core;version="2.2.0",
- org.osgi.service.component.annotations;resolution:=optional
-Service-Component: OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.fx.LDefPresentationReconcilerTypeProvider.xml
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.11.0",
- org.eclipse.fx.text.ui;bundle-version="2.2.0",
- org.eclipse.fx.text;bundle-version="2.2.0",
- org.eclipse.fx.text.compat;bundle-version="2.2.0",
- org.eclipse.text;bundle-version="3.5.400"
-Bundle-Vendor: Eclipse.org
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.fx.LDefPresentationReconcilerTypeProvider.xml b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.fx.LDefPresentationReconcilerTypeProvider.xml
deleted file mode 100644
index 6eb1e6f65..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.fx.LDefPresentationReconcilerTypeProvider.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0" name="org.eclipse.fx.code.editor.ldef.text.fx.LDefPresentationReconcilerTypeProvider">
- <implementation class="org.eclipse.fx.code.editor.ldef.text.fx.LDefPresentationReconcilerTypeProvider"/>
- <service>
- <provide interface="org.eclipse.fx.code.editor.fx.services.PresentationReconcilerTypeProvider"/>
- </service>
- <reference bind="registerModelProvider" cardinality="0..n" interface="org.eclipse.fx.code.editor.ldef.text.LDefModelProvider" name="registerModelProvider" policy="dynamic" policy-option="greedy" unbind="unregisterModelProvider"/>
-</scr:component> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/about.html b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/about.html
deleted file mode 100644
index c258ef55d..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/build.properties b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/build.properties
deleted file mode 100644
index 626772844..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/,\
- about.html
-source.. = src/
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/src/org/eclipse/fx/code/editor/ldef/text/fx/LDefPresentationReconcilerTypeProvider.java b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/src/org/eclipse/fx/code/editor/ldef/text/fx/LDefPresentationReconcilerTypeProvider.java
deleted file mode 100644
index 3200e81d5..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/src/org/eclipse/fx/code/editor/ldef/text/fx/LDefPresentationReconcilerTypeProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.fx.code.editor.ldef.text.fx;
-
-import java.util.Map;
-
-import org.eclipse.fx.code.editor.Input;
-import org.eclipse.fx.code.editor.fx.services.PresentationReconcilerTypeProvider;
-import org.eclipse.fx.code.editor.ldef.text.LDefModelProvider;
-import org.eclipse.fx.code.editor.ldef.text.ModelDependentTypeProvider;
-import org.eclipse.fx.code.editor.ldef.text.fx.internal.LDefPresentationReconciler;
-import org.eclipse.fx.text.ui.presentation.PresentationReconciler;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferenceCardinality;
-import org.osgi.service.component.annotations.ReferencePolicy;
-import org.osgi.service.component.annotations.ReferencePolicyOption;
-
-@Component
-public class LDefPresentationReconcilerTypeProvider extends ModelDependentTypeProvider<PresentationReconciler> implements PresentationReconcilerTypeProvider {
- @Reference(cardinality=ReferenceCardinality.MULTIPLE,policy=ReferencePolicy.DYNAMIC,policyOption=ReferencePolicyOption.GREEDY)
- @Override
- public void registerModelProvider(LDefModelProvider provider, Map<String, Object> properties) {
- super.registerModelProvider(provider, properties);
- }
-
- @Override
- public void unregisterModelProvider(LDefModelProvider provider) {
- super.unregisterModelProvider(provider);
- }
-
- @Override
- public Class<? extends PresentationReconciler> getType(Input<?> s) {
- return LDefPresentationReconciler.class;
- }
-}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/src/org/eclipse/fx/code/editor/ldef/text/fx/internal/LDefPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/src/org/eclipse/fx/code/editor/ldef/text/fx/internal/LDefPresentationReconciler.java
deleted file mode 100644
index d2c696a0c..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/src/org/eclipse/fx/code/editor/ldef/text/fx/internal/LDefPresentationReconciler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.fx.code.editor.ldef.text.fx.internal;
-
-import javax.inject.Inject;
-
-import org.eclipse.fx.code.editor.ldef.lDef.LanguageDef;
-import org.eclipse.fx.code.editor.ldef.lDef.LexicalPartitionHighlighting;
-import org.eclipse.fx.code.editor.ldef.lDef.LexicalPartitionHighlighting_Rule;
-import org.eclipse.fx.text.ui.presentation.PresentationReconciler;
-import org.eclipse.fx.text.ui.rules.DefaultDamagerRepairer;
-
-public class LDefPresentationReconciler extends PresentationReconciler {
-
- @Inject
- public LDefPresentationReconciler(LanguageDef model) {
- for( LexicalPartitionHighlighting sc : model.getLexicalHighlighting().getList() ) {
- if( sc instanceof LexicalPartitionHighlighting_Rule ) {
- LexicalPartitionHighlighting_Rule rs = (LexicalPartitionHighlighting_Rule) sc;
- LDefRuleScanner s = new LDefRuleScanner(rs);
- DefaultDamagerRepairer dr = new DefaultDamagerRepairer(s);
- setDamager(dr, rs.getPartition().getName());
- setRepairer(dr, rs.getPartition().getName());
- }
- }
- }
-}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/src/org/eclipse/fx/code/editor/ldef/text/fx/internal/LDefRuleScanner.java b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/src/org/eclipse/fx/code/editor/ldef/text/fx/internal/LDefRuleScanner.java
deleted file mode 100644
index 93cf303fd..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/src/org/eclipse/fx/code/editor/ldef/text/fx/internal/LDefRuleScanner.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.fx.code.editor.ldef.text.fx.internal;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.regex.Pattern;
-
-import org.eclipse.fx.code.editor.ldef.lDef.Keyword;
-import org.eclipse.fx.code.editor.ldef.lDef.LanguageDef;
-import org.eclipse.fx.code.editor.ldef.lDef.LexicalPartitionHighlighting_Rule;
-import org.eclipse.fx.code.editor.ldef.lDef.Scanner;
-import org.eclipse.fx.code.editor.ldef.lDef.Scanner_CharacterRule;
-import org.eclipse.fx.code.editor.ldef.lDef.Scanner_Keyword;
-import org.eclipse.fx.code.editor.ldef.lDef.Scanner_MultiLineRule;
-import org.eclipse.fx.code.editor.ldef.lDef.Scanner_PatternRule;
-import org.eclipse.fx.code.editor.ldef.lDef.Scanner_SingleLineRule;
-import org.eclipse.fx.code.editor.ldef.text.Util;
-import org.eclipse.fx.text.rules.CharacterRule;
-import org.eclipse.fx.text.rules.CombinedWordRule;
-import org.eclipse.fx.text.rules.JavaLikeWordDetector;
-import org.eclipse.fx.text.rules.RegexRule;
-import org.eclipse.fx.text.ui.TextAttribute;
-import org.eclipse.jface.text.rules.IRule;
-import org.eclipse.jface.text.rules.IWhitespaceDetector;
-import org.eclipse.jface.text.rules.MultiLineRule;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.rules.WhitespaceRule;
-
-@SuppressWarnings("restriction")
-public class LDefRuleScanner extends RuleBasedScanner {
- public LDefRuleScanner(LexicalPartitionHighlighting_Rule scanner) {
- Token defaultToken = null;
- IRule[] rules = new IRule[getRuleCount(scanner)];
- int i = 0;
- Map<Token,Scanner_Keyword> keyWordList = new HashMap<>();
- for( org.eclipse.fx.code.editor.ldef.lDef.Token st : scanner.getTokenList() ) {
- Token token = new Token(new TextAttribute(((LanguageDef)scanner.eContainer().eContainer()).getName() + "." + st.getName()));
- if( st.isDefault() ) {
- defaultToken = token;
- setDefaultReturnToken(token);
- }
-
- for (Scanner ru : st.getScannerList()) {
- if( ru instanceof Scanner_SingleLineRule ) {
- Scanner_SingleLineRule sru = (Scanner_SingleLineRule) ru;
- String endSeq = sru.getEndSeq();
- rules[i++] = Util.wrap(sru.getCheck(),new SingleLineRule(
- sru.getStartSeq(),
- endSeq,
- token,
- sru.getEscapeSeq() != null ? sru.getEscapeSeq().charAt(0) : 0,
- endSeq == null || endSeq.isEmpty()));
- } else if( ru instanceof Scanner_MultiLineRule ) {
- Scanner_MultiLineRule sml = (Scanner_MultiLineRule) ru;
- String endSeq = sml.getEndSeq();
- rules[i++] = Util.wrap(sml.getCheck(),new MultiLineRule(
- sml.getStartSeq(),
- endSeq,
- token,
- sml.getEscapeSeq() != null ? sml.getEscapeSeq().charAt(0) : 0,
- endSeq == null || endSeq.isEmpty()));
- } else if( ru instanceof Scanner_CharacterRule ) {
- Scanner_CharacterRule scr = (Scanner_CharacterRule) ru;
- char[] c = new char[scr.getCharacters().size()];
- for( int j = 0; j < c.length; j++ ) {
- c[j] = scr.getCharacters().get(j).charAt(0);
- }
- rules[i++] = Util.wrap(scr.getCheck(),new CharacterRule(token, c));
- } else if( ru instanceof Scanner_Keyword ) {
- keyWordList.put(token,(Scanner_Keyword) ru);
- } else if( ru instanceof Scanner_PatternRule ) {
- Scanner_PatternRule rr = (Scanner_PatternRule) ru;
- rules[i++] = Util.wrap(rr.getCheck(),new RegexRule(token, Pattern.compile(rr.getStartPattern()), Math.max(1,rr.getLength()),Pattern.compile(rr.getContentPattern())));
- }
- }
- }
-
- if( scanner.getWhitespace() != null ) {
- if( scanner.getWhitespace().isJavawhitespace() ) {
- rules[i++] = new WhitespaceRule(new IWhitespaceDetector() {
-
- @Override
- public boolean isWhitespace(char c) {
- return Character.isWhitespace(c);
- }
- });
- } else {
- rules[i++] = new WhitespaceRule(scanner.getWhitespace().getFileURI() != null ? new JSWSDectector() : new FixedCharacterWSDetector(scanner.getWhitespace().getCharacters()));
- }
- }
-
-
- if( ! keyWordList.isEmpty() ) {
- JavaLikeWordDetector wordDetector= new JavaLikeWordDetector();
- CombinedWordRule combinedWordRule= new CombinedWordRule(wordDetector, defaultToken);
- for( Entry<Token, Scanner_Keyword> kg : keyWordList.entrySet() ) {
- CombinedWordRule.WordMatcher wordRule= new CombinedWordRule.WordMatcher();
- for( Keyword k : kg.getValue().getKeywords() ) {
- wordRule.addWord(k.getName(), kg.getKey());
- }
- combinedWordRule.addWordMatcher(wordRule);
- }
- rules[rules.length-1] = combinedWordRule;
- }
-
- setRules(rules);
- }
-
- private static int getRuleCount(LexicalPartitionHighlighting_Rule scanner) {
- int rv = 0;
- boolean hasKeyGroup = false;
- for (org.eclipse.fx.code.editor.ldef.lDef.Token token : scanner.getTokenList()) {
- rv += token.getScannerList().stream().filter( s -> ! (s instanceof Scanner_Keyword)).count();
- if( token.getScannerList().stream().filter( s -> s instanceof Scanner_Keyword).count() > 0 ) {
- hasKeyGroup = true;
- }
- }
-
- if( hasKeyGroup ) {
- rv += 1;
- }
-
- if(scanner.getWhitespace() != null) {
- rv += 1;
- }
-
- return rv;
- }
-
- static class JSWSDectector implements IWhitespaceDetector {
-
- @Override
- public boolean isWhitespace(char c) {
- // TODO Auto-generated method stub
- return false;
- }
-
- }
-
- static class FixedCharacterWSDetector implements IWhitespaceDetector {
- private final char[] chars;
-
- public FixedCharacterWSDetector(List<String> list) {
- chars = new char[list.size()];
- int i = 0;
- for( String s : list ) {
- chars[i++] = s.charAt(0);
- }
- }
-
- @Override
- public boolean isWhitespace(char c) {
- for( char ch : chars ) {
- if( ch == c ) {
- return true;
- }
- }
- return false;
- }
- }
-}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/.classpath b/bundles/code/org.eclipse.fx.code.editor.ldef.text/.classpath
deleted file mode 100644
index eca7bdba8..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/.gitignore b/bundles/code/org.eclipse.fx.code.editor.ldef.text/.gitignore
deleted file mode 100644
index 09e3bc9b2..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/.settings/ca.ecliptical.pde.ds.prefs b/bundles/code/org.eclipse.fx.code.editor.ldef.text/.settings/ca.ecliptical.pde.ds.prefs
deleted file mode 100644
index ab9ef4588..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/.settings/ca.ecliptical.pde.ds.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-enabled=true
-path=OSGI-INF/services
-validationErrorLevel=0
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/.settings/org.eclipse.jdt.core.prefs b/bundles/code/org.eclipse.fx.code.editor.ldef.text/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.ldef.text/META-INF/MANIFEST.MF
deleted file mode 100644
index 971e5d6d3..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Editor configuration based on the LDef-Files
-Bundle-SymbolicName: org.eclipse.fx.code.editor.ldef.text
-Bundle-Version: 2.2.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.e4.core.contexts,
- org.eclipse.emf.ecore;bundle-version="2.11.0",
- org.eclipse.text,
- org.eclipse.fx.text
-Import-Package: javax.inject,
- org.eclipse.fx.code.editor;version="2.2.0",
- org.eclipse.fx.code.editor.ldef.lDef;version="2.2.0",
- org.eclipse.fx.code.editor.services;version="2.2.0",
- org.eclipse.fx.core;version="2.2.0",
- org.eclipse.fx.core.function;version="2.2.0",
- org.eclipse.jface.text.rules,
- org.osgi.service.component.annotations;resolution:=optional
-Service-Component: OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.internal.LDefModelCF.xml,
- OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.internal.LDefDocumentPartitionerProvider.xml
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.fx.code.editor.ldef.text;version="2.2.0";x-internal:=true
-Bundle-Vendor: Eclipse.org
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.internal.LDefDocumentPartitionerProvider.xml b/bundles/code/org.eclipse.fx.code.editor.ldef.text/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.internal.LDefDocumentPartitionerProvider.xml
deleted file mode 100644
index 860f58086..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.internal.LDefDocumentPartitionerProvider.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0" name="org.eclipse.fx.code.editor.ldef.text.internal.LDefDocumentPartitionerProvider">
- <implementation class="org.eclipse.fx.code.editor.ldef.text.internal.LDefDocumentPartitionerProvider"/>
- <service>
- <provide interface="org.eclipse.fx.code.editor.services.DocumentPartitionerTypeProvider"/>
- </service>
- <reference bind="registerModelProvider" cardinality="0..n" interface="org.eclipse.fx.code.editor.ldef.text.LDefModelProvider" name="registerModelProvider" policy="dynamic" policy-option="greedy" unbind="unregisterModelProvider"/>
-</scr:component> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.internal.LDefModelCF.xml b/bundles/code/org.eclipse.fx.code.editor.ldef.text/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.internal.LDefModelCF.xml
deleted file mode 100644
index 8da4937ef..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.internal.LDefModelCF.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0" name="org.eclipse.fx.code.editor.ldef.text.internal.LDefModelCF">
- <implementation class="org.eclipse.fx.code.editor.ldef.text.internal.LDefModelCF"/>
- <service>
- <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
- </service>
- <property name="service.context.key" value="org.eclipse.fx.code.editor.ldef.lDef.LanguageDef"/>
- <reference bind="registerProvider" cardinality="0..n" interface="org.eclipse.fx.code.editor.ldef.text.LDefModelProvider" name="registerProvider" policy="dynamic" policy-option="greedy" unbind="unregisterProvider"/>
-</scr:component> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/about.html b/bundles/code/org.eclipse.fx.code.editor.ldef.text/about.html
deleted file mode 100644
index c258ef55d..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/build.properties b/bundles/code/org.eclipse.fx.code.editor.ldef.text/build.properties
deleted file mode 100644
index 626772844..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/,\
- about.html
-source.. = src/
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/LDefModelProvider.java b/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/LDefModelProvider.java
deleted file mode 100644
index 77bb6c983..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/LDefModelProvider.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.eclipse.fx.code.editor.ldef.text;
-
-import org.eclipse.fx.code.editor.Input;
-import org.eclipse.fx.code.editor.ldef.lDef.LanguageDef;
-
-public interface LDefModelProvider {
- public boolean applies(Input<?> input);
- public LanguageDef getModel(Input<?> input);
-}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/LDefPartitioner.java b/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/LDefPartitioner.java
deleted file mode 100644
index f827e40f0..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/LDefPartitioner.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.fx.code.editor.ldef.text;
-
-import javax.inject.Inject;
-
-import org.eclipse.fx.code.editor.ldef.lDef.LanguageDef;
-import org.eclipse.fx.code.editor.ldef.lDef.Partitioner;
-import org.eclipse.fx.code.editor.ldef.lDef.Partitioner_Rule;
-import org.eclipse.fx.code.editor.ldef.text.internal.LDefRuleBasedPartitionScanner;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.rules.FastPartitioner;
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;
-
-public class LDefPartitioner extends FastPartitioner {
-
- @Inject
- public LDefPartitioner(LanguageDef m) {
- super(getScanner(m), getParitions(m));
- }
-
- private static IPartitionTokenScanner getScanner(LanguageDef m) {
- Partitioner partitioner = m.getParitioning().getPartitioner();
- IPartitionTokenScanner scanner = null;
- if( partitioner instanceof Partitioner_Rule ) {
- scanner = new LDefRuleBasedPartitionScanner((Partitioner_Rule) partitioner);
- }
- return scanner;
- }
-
- private static String[] getParitions(LanguageDef m) {
- return m.getParitioning().getPartitions()
- .stream().filter( p -> ! p.getName().equals(IDocument.DEFAULT_CONTENT_TYPE))
- .map((p) -> p.getName())
- .toArray((size) -> new String[size]);
- }
-}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/ModelDependentTypeProvider.java b/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/ModelDependentTypeProvider.java
deleted file mode 100644
index e1fc68f8e..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/ModelDependentTypeProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.fx.code.editor.ldef.text;
-
-import static org.eclipse.fx.core.RankedObjectRegistry.getOSGiServiceRank;
-
-import java.util.Map;
-
-import org.eclipse.fx.code.editor.Input;
-import org.eclipse.fx.code.editor.services.InputDependentTypeProviderService;
-import org.eclipse.fx.core.RankedObjectRegistry;
-
-public abstract class ModelDependentTypeProvider<T> implements InputDependentTypeProviderService<T> {
- private RankedObjectRegistry<LDefModelProvider> modelProviders = new RankedObjectRegistry<>();
-
- public void registerModelProvider(LDefModelProvider provider, Map<String, Object> properties) {
- modelProviders.registerObject(getOSGiServiceRank(properties), provider);
- }
-
- public void unregisterModelProvider(LDefModelProvider provider) {
- modelProviders.unregisterObject(provider);
- }
-
- @Override
- public boolean test(Input<?> s) {
- synchronized (modelProviders) {
- return modelProviders.unsynchronizedStream().filter( m -> m.applies(s)).findFirst().isPresent();
- }
- }
-
-}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/Util.java b/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/Util.java
deleted file mode 100644
index 413ca735b..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/Util.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.fx.code.editor.ldef.text;
-
-import java.util.function.IntPredicate;
-
-import org.eclipse.fx.code.editor.ldef.lDef.Check;
-import org.eclipse.fx.code.editor.ldef.lDef.Equals;
-import org.eclipse.fx.code.editor.ldef.lDef.Range;
-import org.eclipse.fx.core.function.IntRelationOperation;
-import org.eclipse.fx.text.rules.ColumnStartRule;
-import org.eclipse.fx.text.rules.PredicateColumnStartRule;
-import org.eclipse.jface.text.rules.IPredicateRule;
-import org.eclipse.jface.text.rules.IRule;
-
-@SuppressWarnings("restriction")
-public class Util {
- public static IRule wrap(Check check, IRule rule) {
- if( check == null ) {
- return rule;
- } else {
- IntPredicate p = null;
- if( check instanceof Equals ) {
- int c = ((Equals) check).getValue();
- p = v -> v == c;
- } else if( check instanceof Range ) {
- Range r = (Range) check;
- if( ! r.getMinValue().isEmpty() && ! r.getMaxValue().isEmpty() ) {
- int min = r.getMinValue().get(0);
- int max = r.getMaxValue().get(0);
- IntRelationOperation minOp = r.getLtIncl().equals("(") ? IntRelationOperation::lt : IntRelationOperation::lte;
- IntRelationOperation maxOp = r.getLtIncl().equals(")") ? IntRelationOperation::lt : IntRelationOperation::lte;
- p = v -> minOp.apply(min, v) && maxOp.apply(v,max);
- } else if( ! r.getMinValue().isEmpty() ) {
- int min = r.getMinValue().get(0);
- IntRelationOperation minOp = r.getLtIncl().equals("(") ? IntRelationOperation::lt : IntRelationOperation::lte;
- p = v -> minOp.apply(min, v);
- } else if( ! r.getMaxValue().isEmpty() ) {
- int max = r.getMaxValue().get(0);
- IntRelationOperation maxOp = r.getLtIncl().equals(")") ? IntRelationOperation::lt : IntRelationOperation::lte;
- p = v -> maxOp.apply(v,max);
- }
- }
-
- if( p != null ) {
- return rule instanceof IPredicateRule ? new PredicateColumnStartRule((IPredicateRule) rule, p) : new ColumnStartRule(rule, p);
- } else {
- return rule;
- }
- }
- }
-}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/internal/LDefDocumentPartitionerProvider.java b/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/internal/LDefDocumentPartitionerProvider.java
deleted file mode 100644
index 5df7e7a89..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/internal/LDefDocumentPartitionerProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.fx.code.editor.ldef.text.internal;
-
-import java.util.Map;
-
-import org.eclipse.fx.code.editor.Input;
-import org.eclipse.fx.code.editor.ldef.text.LDefModelProvider;
-import org.eclipse.fx.code.editor.ldef.text.LDefPartitioner;
-import org.eclipse.fx.code.editor.ldef.text.ModelDependentTypeProvider;
-import org.eclipse.fx.code.editor.services.DocumentPartitionerTypeProvider;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferenceCardinality;
-import org.osgi.service.component.annotations.ReferencePolicy;
-import org.osgi.service.component.annotations.ReferencePolicyOption;
-
-@Component
-public class LDefDocumentPartitionerProvider extends ModelDependentTypeProvider<IDocumentPartitioner> implements DocumentPartitionerTypeProvider {
- @Reference(cardinality=ReferenceCardinality.MULTIPLE,policy=ReferencePolicy.DYNAMIC,policyOption=ReferencePolicyOption.GREEDY)
- @Override
- public void registerModelProvider(LDefModelProvider provider, Map<String, Object> properties) {
- super.registerModelProvider(provider, properties);
- }
-
- @Override
- public void unregisterModelProvider(LDefModelProvider provider) {
- super.unregisterModelProvider(provider);
- }
-
- @Override
- public Class<? extends IDocumentPartitioner> getType(Input<?> input) {
- return LDefPartitioner.class;
- }
-
-}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/internal/LDefModelCF.java b/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/internal/LDefModelCF.java
deleted file mode 100644
index 946687192..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/internal/LDefModelCF.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.fx.code.editor.ldef.text.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.e4.core.contexts.ContextFunction;
-import org.eclipse.e4.core.contexts.IContextFunction;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.fx.code.editor.Input;
-import org.eclipse.fx.code.editor.ldef.text.LDefModelProvider;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferenceCardinality;
-import org.osgi.service.component.annotations.ReferencePolicy;
-import org.osgi.service.component.annotations.ReferencePolicyOption;
-
-@Component(service=IContextFunction.class,property={"service.context.key=org.eclipse.fx.code.editor.ldef.lDef.LanguageDef"})
-public class LDefModelCF extends ContextFunction {
- private List<LDefModelProvider> providerList = new ArrayList<>();
-
- @Reference(cardinality=ReferenceCardinality.MULTIPLE,policy=ReferencePolicy.DYNAMIC,policyOption=ReferencePolicyOption.GREEDY)
- public void registerProvider(LDefModelProvider provider) {
- synchronized (providerList) {
- providerList.add(provider);
- }
- }
-
- public void unregisterProvider(LDefModelProvider provider) {
- synchronized (providerList) {
- providerList.remove(provider);
- }
- }
-
- @Override
- public Object compute(IEclipseContext context) {
- List<LDefModelProvider> list;
-
- synchronized (providerList) {
- list = new ArrayList<>(providerList);
- }
-
- Input<?> input = context.get(Input.class);
-
- return list.stream()
- .filter( p -> p.applies(input))
- .findFirst()
- .map( p -> p.getModel(input)).orElse(null);
- }
-}
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/internal/LDefRuleBasedPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/internal/LDefRuleBasedPartitionScanner.java
deleted file mode 100644
index b1d031c72..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/src/org/eclipse/fx/code/editor/ldef/text/internal/LDefRuleBasedPartitionScanner.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 BestSolution.at and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.fx.code.editor.ldef.text.internal;
-
-import org.eclipse.fx.code.editor.ldef.lDef.Partition_MultiLineRule;
-import org.eclipse.fx.code.editor.ldef.lDef.Partition_Rule;
-import org.eclipse.fx.code.editor.ldef.lDef.Partition_SingleLineRule;
-import org.eclipse.fx.code.editor.ldef.lDef.Partitioner_Rule;
-import org.eclipse.fx.code.editor.ldef.text.Util;
-import org.eclipse.jface.text.rules.IPredicateRule;
-import org.eclipse.jface.text.rules.MultiLineRule;
-import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-
-@SuppressWarnings("restriction")
-public class LDefRuleBasedPartitionScanner extends RuleBasedPartitionScanner {
- public LDefRuleBasedPartitionScanner(Partitioner_Rule paritioner) {
- IPredicateRule[] pr = new IPredicateRule[paritioner.getRuleList().size()];
- int i = 0;
-
- for( Partition_Rule r : paritioner.getRuleList() ) {
- if( r instanceof Partition_SingleLineRule ) {
- Partition_SingleLineRule sr = (Partition_SingleLineRule) r;
- String endSeq = sr.getEndSeq();
- String escapeSeq = sr.getEscapeSeq();
- pr[i] = new SingleLineRule(sr.getStartSeq(), endSeq, new Token(sr.getParition().getName()), escapeSeq != null ? escapeSeq.charAt(0) : 0, endSeq == null || endSeq.isEmpty());
- } else if( r instanceof Partition_MultiLineRule ) {
- Partition_MultiLineRule mr = (Partition_MultiLineRule) r;
- String endSeq = mr.getEndSeq();
- String escapeSeq = mr.getEscapeSeq();
- pr[i] = new MultiLineRule(mr.getStartSeq(), endSeq, new Token(mr.getParition().getName()), escapeSeq != null ? escapeSeq.charAt(0) : 0, endSeq == null || endSeq.isEmpty());
- }
-
- pr[i] = (IPredicateRule) Util.wrap(r.getCheck(),pr[i]);
-
- i++;
- }
- setPredicateRules(pr);
- }
-}
diff --git a/releng/org.eclipse.fx.ide.releng/pom.xml b/releng/org.eclipse.fx.ide.releng/pom.xml
index db7835b19..fca52946b 100755
--- a/releng/org.eclipse.fx.ide.releng/pom.xml
+++ b/releng/org.eclipse.fx.ide.releng/pom.xml
@@ -71,6 +71,8 @@
<module>../../bundles/tooling/org.eclipse.fx.ide.gmodel</module>
<module>../../bundles/tooling/org.eclipse.fx.ide.gmodel.ui</module>
+ <!-- ldef -->
+ <module>../../bundles/code/org.eclipse.fx.code.editor.ldef</module>
<module>../../bundles/code/org.eclipse.fx.code.editor.ldef.ui</module>
<!-- Mobile -->

Back to the top