PT #155622190: STS4 CF Manifest editor across everything

This commit is contained in:
BoykoAlex
2019-04-08 15:03:19 -04:00
parent d1d6bd9d26
commit 37764056cf
9 changed files with 68 additions and 48 deletions

View File

@@ -2,43 +2,6 @@
<?eclipse version="3.4"?>
<plugin>
<extension
point="org.eclipse.core.contenttype.contentTypes">
<content-type
default-charset="UTF-8"
id="org.springframework.ide.eclipse.manifest.yml"
name="Cloudfoundry Manifest"
file-names="manifest.yml"
priority="high">
</content-type>
</extension>
<extension
point="org.eclipse.ui.editors">
<editorContentTypeBinding
contentTypeId="org.springframework.ide.eclipse.manifest.yml"
editorId="org.eclipse.ui.genericeditor.GenericEditor">
</editorContentTypeBinding>
</extension>
<extension
point="org.eclipse.ui.genericeditor.presentationReconcilers">
<presentationReconciler
class="org.eclipse.tm4e.ui.text.TMPresentationReconciler"
contentType="org.springframework.ide.eclipse.manifest.yml">
</presentationReconciler>
</extension>
<extension
point="org.eclipse.tm4e.registry.grammars">
<grammar
scopeName="source.yaml"
path="./syntaxes/YAML.tmLanguage" >
</grammar>
<scopeNameContentTypeBinding
contentTypeId="org.springframework.ide.eclipse.manifest.yml"
scopeName="source.yaml">
</scopeNameContentTypeBinding>
</extension>
</plugin>

View File

@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="icons/"/>
<classpathentry exported="true" kind="lib" path="syntaxes/"/>
<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"/>

View File

@@ -11,7 +11,15 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
org.eclipse.lsp4j;bundle-version="0.6.0",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.6.0",
org.springframework.tooling.ls.eclipse.commons;bundle-version="4.0.0",
com.google.guava
com.google.guava,
org.eclipse.core.resources,
org.eclipse.ui.genericeditor;bundle-version="1.0.0",
org.eclipse.tm4e.core;bundle-version="0.1.0",
org.eclipse.tm4e.ui;bundle-version="0.1.0",
org.eclipse.ui
Import-Package: org.eclipse.jface.preference,
org.osgi.framework
Export-Package: org.springframework.tooling.cloudfoundry.manifest.ls
Bundle-ClassPath: icons/,
syntaxes/,
.

View File

@@ -4,4 +4,6 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
servers/,\
about.html
about.html,\
icons/,\
syntaxes/

Binary file not shown.

After

Width:  |  Height:  |  Size: 697 B

View File

@@ -16,4 +16,55 @@
</contentTypeMapping>
</extension>
<extension
point="org.eclipse.core.contenttype.contentTypes">
<content-type
default-charset="UTF-8"
id="org.springframework.ide.eclipse.manifest.yml"
name="Cloudfoundry Manifest"
file-names="manifest.yml"
priority="high">
</content-type>
<file-association
content-type="org.springframework.ide.eclipse.manifest.yml"
file-names="manifest.yml"
file-patterns="*manifest*.yml">
</file-association>
</extension>
<extension
point="org.eclipse.ui.editors">
<editor
class="org.springframework.tooling.ls.eclipse.commons.YamlGenericEditor"
contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
icon="icons/cloud_obj.png"
id="CfManifestYMLEditor"
name="Generic Editor - Cloudfoundry Manifest YAML"
symbolicFontName="org.eclipse.jdt.ui.PropertiesFileEditor.textfont">
<contentTypeBinding
contentTypeId="org.springframework.ide.eclipse.manifest.yml">
</contentTypeBinding>
</editor>
</extension>
<extension
point="org.eclipse.ui.genericeditor.presentationReconcilers">
<presentationReconciler
class="org.eclipse.tm4e.ui.text.TMPresentationReconciler"
contentType="org.springframework.ide.eclipse.manifest.yml">
</presentationReconciler>
</extension>
<extension
point="org.eclipse.tm4e.registry.grammars">
<grammar
scopeName="source.yaml"
path="syntaxes/YAML.tmLanguage" >
</grammar>
<scopeNameContentTypeBinding
contentTypeId="org.springframework.ide.eclipse.manifest.yml"
scopeName="source.yaml">
</scopeNameContentTypeBinding>
</extension>
</plugin>

View File

@@ -58,21 +58,18 @@ public abstract class STS4LanguageServerProcessStreamConnector extends ProcessSt
forwardTo(getLanguageServerLog(), console.out);
} else {
Job job = new Job("Consume LS error stream") {
new Thread("Consume LS error stream") {
@Override
protected IStatus run(IProgressMonitor monitor) {
public void run() {
try {
IOUtil.consume(getLanguageServerLog());
} catch (IOException e) {
// ignore
}
return Status.OK_STATUS;
}
};
job.setSystem(true);
job.schedule();
}.start();;
}
}
}

View File

@@ -51,9 +51,6 @@
<module>org.springframework.tooling.cloudfoundry.manifest.ls.feature</module>
<module>org.springframework.tooling.ls.repository</module>
<module>org.springframework.tooling.cloudfoundry.manifest.ls.integration</module>
<module>org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature</module>
<module>org.springframework.tooling.ls.eclipse.gotosymbol</module>
<module>org.springframework.tooling.boot.ls</module>
<module>org.springframework.tooling.boot.ls.feature</module>