diff options
author | Tom Schindl | 2015-11-25 23:54:36 +0000 |
---|---|---|
committer | Tom Schindl | 2015-11-26 00:02:27 +0000 |
commit | 57336390089f2d17f8fbaadcb40fc1e5d7765c27 (patch) | |
tree | d95950874f0f43bc614942b600a77258f030b130 | |
parent | 9cc6ac358c910aa794c3b3f906a76fdd974c78d0 (diff) | |
download | org.eclipse.efxclipse-57336390089f2d17f8fbaadcb40fc1e5d7765c27.tar.gz org.eclipse.efxclipse-57336390089f2d17f8fbaadcb40fc1e5d7765c27.tar.xz org.eclipse.efxclipse-57336390089f2d17f8fbaadcb40fc1e5d7765c27.zip |
renamed languages bundle
50 files changed, 93 insertions, 47 deletions
diff --git a/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/services/FXCompletionProposal.java b/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/services/FXCompletionProposal.java index a201a18f7..80084edbd 100644 --- a/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/services/FXCompletionProposal.java +++ b/bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/services/FXCompletionProposal.java @@ -9,12 +9,19 @@ import org.eclipse.jface.text.IDocument; import javafx.scene.Node; +@SuppressWarnings("restriction") public class FXCompletionProposal implements ICompletionProposal { private final CompletionProposal proposal; private final Supplier<Node> graphicSupplier; + private final CharSequence label; public FXCompletionProposal(CompletionProposal proposal, Supplier<Node> graphicSupplier) { + this(proposal,proposal.getLabel(),graphicSupplier); + } + + public FXCompletionProposal(CompletionProposal proposal, CharSequence label, Supplier<Node> graphicSupplier) { this.proposal = proposal; + this.label = label; this.graphicSupplier = graphicSupplier; } @@ -25,7 +32,7 @@ public class FXCompletionProposal implements ICompletionProposal { @Override public CharSequence getLabel() { - return proposal.getLabel(); + return label; } @Override diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/.classpath b/bundles/code/org.eclipse.fx.code.editor.langs/.classpath index eca7bdba8..eca7bdba8 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/.classpath +++ b/bundles/code/org.eclipse.fx.code.editor.langs/.classpath diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/.gitignore b/bundles/code/org.eclipse.fx.code.editor.langs/.gitignore index 09e3bc9b2..09e3bc9b2 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/.gitignore +++ b/bundles/code/org.eclipse.fx.code.editor.langs/.gitignore diff --git a/bundles/code/org.eclipse.fx.code.editor.langs/.project b/bundles/code/org.eclipse.fx.code.editor.langs/.project new file mode 100644 index 000000000..6f567b404 --- /dev/null +++ b/bundles/code/org.eclipse.fx.code.editor.langs/.project @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.fx.code.editor.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> + </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> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + </natures> +</projectDescription> diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/.settings/org.eclipse.fx.code.editor.ldef.LDef.prefs b/bundles/code/org.eclipse.fx.code.editor.langs/.settings/org.eclipse.fx.code.editor.ldef.LDef.prefs index 37937b72c..37937b72c 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/.settings/org.eclipse.fx.code.editor.ldef.LDef.prefs +++ b/bundles/code/org.eclipse.fx.code.editor.langs/.settings/org.eclipse.fx.code.editor.ldef.LDef.prefs diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/.settings/org.eclipse.jdt.core.prefs b/bundles/code/org.eclipse.fx.code.editor.langs/.settings/org.eclipse.jdt.core.prefs index 0c68a61dc..0c68a61dc 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/code/org.eclipse.fx.code.editor.langs/.settings/org.eclipse.jdt.core.prefs diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.langs/META-INF/MANIFEST.MF index 01f9f2ed3..8105214c0 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/META-INF/MANIFEST.MF +++ b/bundles/code/org.eclipse.fx.code.editor.langs/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Various basic language definitions -Bundle-SymbolicName: org.eclipse.fx.code.editor.ldef.langs +Bundle-SymbolicName: org.eclipse.fx.code.editor.langs Bundle-Version: 2.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.osgi.service.component.annotations;version="[1.2.0,2.0.0)" diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/about.html b/bundles/code/org.eclipse.fx.code.editor.langs/about.html index c258ef55d..c258ef55d 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/about.html +++ b/bundles/code/org.eclipse.fx.code.editor.langs/about.html diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/build.properties b/bundles/code/org.eclipse.fx.code.editor.langs/build.properties index 41add1c12..41add1c12 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/build.properties +++ b/bundles/code/org.eclipse.fx.code.editor.langs/build.properties diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/pom.xml b/bundles/code/org.eclipse.fx.code.editor.langs/pom.xml index 626cab82e..e22eda698 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.langs/pom.xml +++ b/bundles/code/org.eclipse.fx.code.editor.langs/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <name>e(fx)clipse - Runtime - Code - Ldefs for various common languages</name> <groupId>org.eclipse.fx.runtime</groupId> - <artifactId>org.eclipse.fx.code.editor.ldef.langs</artifactId> + <artifactId>org.eclipse.fx.code.editor.langs</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/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/asciidoc/asciidoc.ldef index 354346bed..354346bed 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/asciidoc/asciidoc.ldef diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/asciidoc/highlight.css index d98894ffb..d98894ffb 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/asciidoc/highlight.css diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/ceylon.ldef index a10ca4592..a10ca4592 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/ceylon.ldef diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css index 82f8f4112..82f8f4112 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/dart.ldef index d58c254e7..d58c254e7 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/dart.ldef diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css index bcb0c717d..bcb0c717d 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/gls.ldef index a2c8b5300..a2c8b5300 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/gls.ldef diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/go.ldef index 0e5a12440..0e5a12440 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/go.ldef diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css index 17fb7ead0..17fb7ead0 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/groovy.ldef index 9ff6bfd1f..9ff6bfd1f 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/groovy.ldef diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css index 8ea161a8c..8ea161a8c 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css index 0d3dc5568..0d3dc5568 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/java.ldef index 7b0f153a8..7b0f153a8 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/java.ldef diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css index 935bf863d..935bf863d 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/js.ldef index a7cd61780..a7cd61780 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/js.ldef diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css index b25d35036..b25d35036 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/kotlin.ldef index 6b6efaaa4..6b6efaaa4 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/kotlin.ldef diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css index f4b1b2334..f4b1b2334 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/lua.ldef index f43a8fb65..f43a8fb65 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/lua.ldef diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css index 10e3482db..10e3482db 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/php.ldef index 726999f6a..726999f6a 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/php.ldef diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css index 3924a5af1..3924a5af1 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/python.ldef index 9792d64f8..9792d64f8 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/python.ldef diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css index b1f910d23..b1f910d23 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/rust.ldef index 48394764e..48394764e 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/rust.ldef diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css index 53c14692f..53c14692f 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/swift.ldef index f0163ca79..f0163ca79 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/swift.ldef diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css index 46c13c74c..46c13c74c 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/highlight.css diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.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/xml.ldef index 8ffbcfe68..8ffbcfe68 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.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/xml.ldef 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.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/GoPartitionScanner.java index c8f749d76..303269515 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.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/go/GoPartitionScanner.java @@ -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/groovy/GroovyPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/GroovyPartitionScanner.java index 0d9842042..0853f2327 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.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/groovy/GroovyPartitionScanner.java @@ -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/js/JsPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/JsPartitionScanner.java index 1291c03ca..e9febfd00 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.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/js/JsPartitionScanner.java @@ -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/kotlin/KotlinPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/KotlinPartitionScanner.java index 5022bf285..473a564b6 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.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/kotlin/KotlinPartitionScanner.java @@ -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/php/PhpPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/PhpPartitionScanner.java index ec4a02c4d..10f9521ff 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.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/php/PhpPartitionScanner.java @@ -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/python/PyPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/PyPartitionScanner.java index 8007de480..458fc1ae0 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.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/python/PyPartitionScanner.java @@ -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/swift/SwiftPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/SwiftPartitionScanner.java index 3ffc6c910..42b93aed4 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.ldef.langs.fx/src/org/eclipse/fx/code/editor/ldef/langs/fx/swift/SwiftPartitionScanner.java @@ -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.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 index 42aed4317..192b8548e 100644 --- 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 @@ -24,20 +24,20 @@ public class LDefDefaultModelProvider implements LDefModelProvider { LDefStandaloneSetup.doSetup(); rs = new ResourceSetImpl(); - register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/dart/dart.ldef"),"dart"); - register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/js/js.ldef"),"js"); - register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/java/java.ldef"),"java"); - register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/xml/xml.ldef"),"xml"); - register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/go/go.ldef"),"go"); - register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/rust/rust.ldef"),"rust"); - register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/swift/swift.ldef"),"swift"); - register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/groovy/groovy.ldef"),"groovy"); - register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/python/python.ldef"),"python"); - register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/php/php.ldef"),"php"); - register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/asciidoc/asciidoc.ldef"),"adoc"); - register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/ceylon/ceylon.ldef"),"ceylon"); - register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/kotlin/kotlin.ldef"),"kotlin"); - register(URI.createURI("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/lua/lua.ldef"),"lua"); + 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) { 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.ldef.langs.themes/src/org/eclipse/fx/code/editor/ldef/langs/themes/DefaultEditorStylesheets.java index 39bb5c174..8a0989095 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.ldef.langs.themes/src/org/eclipse/fx/code/editor/ldef/langs/themes/DefaultEditorStylesheets.java @@ -20,20 +20,20 @@ public class DefaultEditorStylesheets implements MultiURLStylesheet { try { stylesheets = FXCollections.observableArrayList( - new URL("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/dart/highlight.css") - , new URL("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/js/highlight.css") - , new URL("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/java/highlight.css") - , new URL("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/xml/highlight.css") - , new URL("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/go/highlight.css") - , new URL("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/rust/highlight.css") - , new URL("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/swift/highlight.css") - , new URL("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/groovy/highlight.css") - , new URL("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/python/highlight.css") - , new URL("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/ceylon/highlight.css") - , new URL("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/kotlin/highlight.css") - , new URL("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/php/highlight.css") - , new URL("platform:/plugin/org.eclipse.fx.code.editor.ldef.langs/org/eclipse/fx/code/editor/ldef/langs/asciidoc/highlight.css") - , new URL("platform:/plugin/org.eclipse.fx.code.editor.ldef.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/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") ); } catch (MalformedURLException e) { } diff --git a/releng/code/org.eclipse.fx.code.target.feature/feature.xml b/releng/code/org.eclipse.fx.code.target.feature/feature.xml index 43a9a22e0..016cc8f93 100644 --- a/releng/code/org.eclipse.fx.code.target.feature/feature.xml +++ b/releng/code/org.eclipse.fx.code.target.feature/feature.xml @@ -423,14 +423,14 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U unpack="false"/> <plugin - id="org.eclipse.fx.code.editor.ldef.langs" + id="org.eclipse.fx.code.editor.langs" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.eclipse.fx.code.editor.ldef.langs.source" + id="org.eclipse.fx.code.editor.langs.source" download-size="0" install-size="0" version="0.0.0" diff --git a/releng/org.eclipse.fx.releng/pom.xml b/releng/org.eclipse.fx.releng/pom.xml index 5e144e6fd..8a50b4d7a 100755 --- a/releng/org.eclipse.fx.releng/pom.xml +++ b/releng/org.eclipse.fx.releng/pom.xml @@ -87,7 +87,7 @@ <module>../../bundles/code/org.eclipse.fx.code.editor.ldef</module> <module>../../bundles/code/org.eclipse.fx.code.editor.ldef.text</module> <module>../../bundles/code/org.eclipse.fx.code.editor.ldef.text.fx</module> - <module>../../bundles/code/org.eclipse.fx.code.editor.ldef.langs</module> + <module>../../bundles/code/org.eclipse.fx.code.editor.langs</module> <module>../../bundles/code/org.eclipse.fx.code.editor.ldef.langs.fx</module> <module>../../bundles/code/org.eclipse.fx.code.editor.ldef.langs.text</module> <module>../../bundles/code/org.eclipse.fx.code.editor.ldef.langs.themes</module> |