Skip to content

Commit

Permalink
Issue #29: Separate language-specific content and APIs.
Browse files Browse the repository at this point in the history
  • Loading branch information
mickaelistria committed Sep 29, 2016
1 parent c5ef849 commit 2c58077
Show file tree
Hide file tree
Showing 14 changed files with 194 additions and 59 deletions.
7 changes: 7 additions & 0 deletions org.eclipse.languageserver.languages/.classpath
@@ -0,0 +1,7 @@
<?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>
28 changes: 28 additions & 0 deletions org.eclipse.languageserver.languages/.project
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.languageserver.languages</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>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
14 changes: 14 additions & 0 deletions org.eclipse.languageserver.languages/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Support for Languages using Language Servers (C#, CSS, LESS, SCSS, JSON)
Bundle-SymbolicName: org.eclipse.languageserver.languages;singleton:=true
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.debug.core,
org.eclipse.languageserver;bundle-version="0.1.0",
org.eclipse.ui,
org.apache.commons.io;bundle-version="2.2.0",
org.eclipse.core.externaltools,
org.eclipse.jface.text
5 changes: 5 additions & 0 deletions org.eclipse.languageserver.languages/build.properties
@@ -0,0 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml
87 changes: 87 additions & 0 deletions org.eclipse.languageserver.languages/plugin.xml
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
<extension
point="org.eclipse.core.contenttype.contentTypes">
<content-type
base-type="org.eclipse.core.runtime.text"
file-extensions="cs"
id="org.eclipse.languageserver.languages.csharp"
name="C Sharp"
priority="normal">
</content-type>
<content-type
base-type="org.eclipse.core.runtime.text"
file-extensions="less"
id="org.eclipse.languageserver.languages.less"
name="LESS"
priority="normal">
</content-type>
<content-type
base-type="org.eclipse.core.runtime.text"
file-extensions="scss,sass"
id="org.eclipse.languageserver.languages.scss"
name="SCSS/SASS"
priority="normal">
</content-type>
</extension>
<extension
point="org.eclipse.ui.genericeditor.presentationReconcilers">
<presentationReconciler
class="org.eclipse.languageserver.languages.csharp.CSharpKeywordsHighlighter"
contentType="org.eclipse.languageserver.languages.csharp">
</presentationReconciler>
</extension>
<extension
point="org.eclipse.ui.startup">
<startup
class="org.eclipse.languageserver.languages.InitializeLaunchConfigurations">
</startup>
</extension>
<extension
point="org.eclipse.ui.genericeditor.hoverProviders">
<hoverProvider
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
contentType="org.eclipse.wst.css.core.csssource">
</hoverProvider>
<hoverProvider
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
contentType="org.eclipse.wst.jsdt.core.jsonSource">
</hoverProvider>
<hoverProvider
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
contentType="org.eclipse.languageserver.languages.csharp">
</hoverProvider>
<hoverProvider
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
contentType="org.eclipse.languageserver.languages.scss">
</hoverProvider>
<hoverProvider
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
contentType="org.eclipse.languageserver.languages.less">
</hoverProvider>
</extension>
<extension
point="org.eclipse.ui.genericeditor.contentAssistProcessors">
<contentAssistProcessor
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
contentType="org.eclipse.wst.css.core.csssource">
</contentAssistProcessor>
<contentAssistProcessor
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
contentType="org.eclipse.wst.jsdt.core.jsonSource">
</contentAssistProcessor>
<contentAssistProcessor
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
contentType="org.eclipse.languageserver.languages.scss">
</contentAssistProcessor>
<contentAssistProcessor
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
contentType="org.eclipse.languageserver.languages.less">
</contentAssistProcessor>
<contentAssistProcessor
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
contentType="org.eclipse.languageserver.languages.csharp">
</contentAssistProcessor>
</extension>
</plugin>
37 changes: 37 additions & 0 deletions org.eclipse.languageserver.languages/pom.xml
@@ -0,0 +1,37 @@
<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>
<artifactId>org.eclipse.languageserver.languages</artifactId>
<parent>
<groupId>org.eclipse.languageserver</groupId>
<artifactId>parent</artifactId>
<version>0.1.0-SNAPSHOT</version>
</parent>
<packaging>eclipse-plugin</packaging>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>0.25.0</version>
<configuration>
<pomDependencies>consider</pomDependencies>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.5</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jsr305</artifactId>
<version>3.0.1_1</version>
</dependency>
</dependencies>

</project>
Expand Up @@ -73,7 +73,7 @@ public void earlyStartup() {
environment.put("LD_LIBRARY_PATH", "/home/mistria/apps/OmniSharp.NET/icu54:" + System.getenv("LD_LIBRARY_PATH"));
workingCopy.setAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, environment);
omniSharpLauch = workingCopy.doSave();
registry.registerAssociation(contentTypeManager.getContentType("org.eclipse.languageserver.csharp"), LaunchConfigurationStreamProvider.findLaunchConfiguration(IExternalToolConstants.ID_PROGRAM_LAUNCH_CONFIGURATION_TYPE, InitializeLaunchConfigurations.OMNISHARP_NAME));
registry.registerAssociation(contentTypeManager.getContentType("org.eclipse.languageserver.languages.csharp"), LaunchConfigurationStreamProvider.findLaunchConfiguration(IExternalToolConstants.ID_PROGRAM_LAUNCH_CONFIGURATION_TYPE, InitializeLaunchConfigurations.OMNISHARP_NAME));
}
} catch (CoreException e) {
e.printStackTrace();
Expand Down Expand Up @@ -101,6 +101,8 @@ public void earlyStartup() {
workingCopy.setAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, getVSCodeLocation() + "/resources/app/extensions/css/server/out/cssServerMain.js --stdio");
omniSharpLauch = workingCopy.doSave();
registry.registerAssociation(contentTypeManager.getContentType("org.eclipse.wst.css.core.csssource"), LaunchConfigurationStreamProvider.findLaunchConfiguration(IExternalToolConstants.ID_PROGRAM_LAUNCH_CONFIGURATION_TYPE, InitializeLaunchConfigurations.VSCODE_CSS_NAME));
registry.registerAssociation(contentTypeManager.getContentType("org.eclipse.languageserver.languages.less"), LaunchConfigurationStreamProvider.findLaunchConfiguration(IExternalToolConstants.ID_PROGRAM_LAUNCH_CONFIGURATION_TYPE, InitializeLaunchConfigurations.VSCODE_CSS_NAME));
registry.registerAssociation(contentTypeManager.getContentType("org.eclipse.languageserver.languages.scss"), LaunchConfigurationStreamProvider.findLaunchConfiguration(IExternalToolConstants.ID_PROGRAM_LAUNCH_CONFIGURATION_TYPE, InitializeLaunchConfigurations.VSCODE_CSS_NAME));
}
} catch (CoreException e) {
e.printStackTrace();
Expand Down
8 changes: 6 additions & 2 deletions org.eclipse.languageserver/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Languageserver
Bundle-Name: Language Server Protocol client for Eclipse
Bundle-SymbolicName: org.eclipse.languageserver;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 0.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
org.eclipse.equinox.common;bundle-version="3.8.0",
Expand Down Expand Up @@ -32,3 +32,7 @@ Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.languageserver.LanguageServerPluginActivator
Export-Package: org.eclipse.languageserver,
org.eclipse.languageserver.operations.completion,
org.eclipse.languageserver.operations.hover
Bundle-Vendor: Eclipse.org
53 changes: 0 additions & 53 deletions org.eclipse.languageserver/plugin.xml
Expand Up @@ -3,36 +3,6 @@
<plugin>
<!-- Extension point will ideally be "org.eclipse.text...." because
the feature should be part of the generic text editor -->
<extension
point="org.eclipse.ui.genericeditor.contentAssistProcessors">
<contentAssistProcessor
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
contentType="org.eclipse.wst.css.core.csssource">
</contentAssistProcessor>
<contentAssistProcessor
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
contentType="org.eclipse.wst.jsdt.core.jsonSource">
</contentAssistProcessor>
<contentAssistProcessor
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
contentType="org.eclipse.languageserver.csharp">
</contentAssistProcessor>
</extension>
<extension
point="org.eclipse.ui.genericeditor.hoverProviders">
<hoverProvider
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
contentType="org.eclipse.wst.css.core.csssource">
</hoverProvider>
<hoverProvider
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
contentType="org.eclipse.wst.jsdt.core.jsonSource">
</hoverProvider>
<hoverProvider
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
contentType="org.eclipse.languageserver.csharp">
</hoverProvider>
</extension>
<extension
id="diagnostic"
point="org.eclipse.core.resources.markers">
Expand All @@ -47,16 +17,6 @@
markerType="org.eclipse.languageserver.diagnostic">
</markerResolutionGenerator>
</extension>
<extension
point="org.eclipse.core.contenttype.contentTypes">
<content-type
base-type="org.eclipse.core.runtime.text"
file-extensions="cs"
id="org.eclipse.languageserver.csharp"
name="C Sharp"
priority="normal">
</content-type>
</extension>
<extension
point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
<hyperlinkDetector
Expand Down Expand Up @@ -128,19 +88,6 @@
searchResultClass="org.eclipse.languageserver.operations.references.LSSearchResult">
</viewPage>
</extension>
<extension
point="org.eclipse.ui.genericeditor.presentationReconcilers">
<presentationReconciler
class="org.eclipse.languageserver.languages.csharp.CSharpKeywordsHighlighter"
contentType="org.eclipse.languageserver.csharp">
</presentationReconciler>
</extension>
<extension
point="org.eclipse.ui.startup">
<startup
class="org.eclipse.languageserver.languages.InitializeLaunchConfigurations">
</startup>
</extension>
<extension
point="org.eclipse.ui.preferencePages">
<page
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.languageserver/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.languageserver</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>0.1.0-SNAPSHOT</version>
</parent>
<packaging>eclipse-plugin</packaging>

Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Expand Up @@ -2,11 +2,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.languageserver</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
<module>org.eclipse.languageserver</module>
<module>org.eclipse.languageserver.languages</module>
<module>repository</module>
</modules>
<build>
Expand Down
3 changes: 3 additions & 0 deletions repository/category.xml
Expand Up @@ -4,6 +4,9 @@
<bundle id="org.eclipse.languageserver">
<category name="Language Server Support for Eclipse"/>
</bundle>
<bundle id="org.eclipse.languageserver.languages">
<category name="Language Server Support for Eclipse"/>
</bundle>

<category-def name="deps" label="Dependencies"/>
<bundle id="io.typefox.lsapi">
Expand Down
2 changes: 1 addition & 1 deletion repository/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.languageserver</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>0.1.0-SNAPSHOT</version>
</parent>
<packaging>eclipse-repository</packaging>

Expand Down

0 comments on commit 2c58077

Please sign in to comment.