From 2c58077d95288e7dcd8b7b60bd4d33597d485ca2 Mon Sep 17 00:00:00 2001
From: Mickael Istria <mistria@redhat.com>
Date: Thu, 29 Sep 2016 17:39:10 +0200
Subject: [PATCH] Issue #29: Separate language-specific content and APIs.

---
 .../.classpath                                |  7 ++
 org.eclipse.languageserver.languages/.project | 28 ++++++
 .../META-INF/MANIFEST.MF                      | 14 +++
 .../build.properties                          |  5 ++
 .../plugin.xml                                | 87 +++++++++++++++++++
 org.eclipse.languageserver.languages/pom.xml  | 37 ++++++++
 .../InitializeLaunchConfigurations.java       |  4 +-
 .../csharp/CSharpKeywordsHighlighter.java     |  0
 .../META-INF/MANIFEST.MF                      |  8 +-
 org.eclipse.languageserver/plugin.xml         | 53 -----------
 org.eclipse.languageserver/pom.xml            |  2 +-
 pom.xml                                       |  3 +-
 repository/category.xml                       |  3 +
 repository/pom.xml                            |  2 +-
 14 files changed, 194 insertions(+), 59 deletions(-)
 create mode 100644 org.eclipse.languageserver.languages/.classpath
 create mode 100644 org.eclipse.languageserver.languages/.project
 create mode 100644 org.eclipse.languageserver.languages/META-INF/MANIFEST.MF
 create mode 100644 org.eclipse.languageserver.languages/build.properties
 create mode 100644 org.eclipse.languageserver.languages/plugin.xml
 create mode 100644 org.eclipse.languageserver.languages/pom.xml
 rename {org.eclipse.languageserver => org.eclipse.languageserver.languages}/src/org/eclipse/languageserver/languages/InitializeLaunchConfigurations.java (91%)
 rename {org.eclipse.languageserver => org.eclipse.languageserver.languages}/src/org/eclipse/languageserver/languages/csharp/CSharpKeywordsHighlighter.java (100%)

diff --git a/org.eclipse.languageserver.languages/.classpath b/org.eclipse.languageserver.languages/.classpath
new file mode 100644
index 0000000..eca7bdb
--- /dev/null
+++ b/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>
diff --git a/org.eclipse.languageserver.languages/.project b/org.eclipse.languageserver.languages/.project
new file mode 100644
index 0000000..789433a
--- /dev/null
+++ b/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>
diff --git a/org.eclipse.languageserver.languages/META-INF/MANIFEST.MF b/org.eclipse.languageserver.languages/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..6db9de2
--- /dev/null
+++ b/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
diff --git a/org.eclipse.languageserver.languages/build.properties b/org.eclipse.languageserver.languages/build.properties
new file mode 100644
index 0000000..e9863e2
--- /dev/null
+++ b/org.eclipse.languageserver.languages/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
diff --git a/org.eclipse.languageserver.languages/plugin.xml b/org.eclipse.languageserver.languages/plugin.xml
new file mode 100644
index 0000000..2cb552c
--- /dev/null
+++ b/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>
diff --git a/org.eclipse.languageserver.languages/pom.xml b/org.eclipse.languageserver.languages/pom.xml
new file mode 100644
index 0000000..c0b212c
--- /dev/null
+++ b/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>
diff --git a/org.eclipse.languageserver/src/org/eclipse/languageserver/languages/InitializeLaunchConfigurations.java b/org.eclipse.languageserver.languages/src/org/eclipse/languageserver/languages/InitializeLaunchConfigurations.java
similarity index 91%
rename from org.eclipse.languageserver/src/org/eclipse/languageserver/languages/InitializeLaunchConfigurations.java
rename to org.eclipse.languageserver.languages/src/org/eclipse/languageserver/languages/InitializeLaunchConfigurations.java
index 8b5a79e..307a617 100644
--- a/org.eclipse.languageserver/src/org/eclipse/languageserver/languages/InitializeLaunchConfigurations.java
+++ b/org.eclipse.languageserver.languages/src/org/eclipse/languageserver/languages/InitializeLaunchConfigurations.java
@@ -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();
@@ -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();
diff --git a/org.eclipse.languageserver/src/org/eclipse/languageserver/languages/csharp/CSharpKeywordsHighlighter.java b/org.eclipse.languageserver.languages/src/org/eclipse/languageserver/languages/csharp/CSharpKeywordsHighlighter.java
similarity index 100%
rename from org.eclipse.languageserver/src/org/eclipse/languageserver/languages/csharp/CSharpKeywordsHighlighter.java
rename to org.eclipse.languageserver.languages/src/org/eclipse/languageserver/languages/csharp/CSharpKeywordsHighlighter.java
diff --git a/org.eclipse.languageserver/META-INF/MANIFEST.MF b/org.eclipse.languageserver/META-INF/MANIFEST.MF
index b185c90..331943d 100644
--- a/org.eclipse.languageserver/META-INF/MANIFEST.MF
+++ b/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",
@@ -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
diff --git a/org.eclipse.languageserver/plugin.xml b/org.eclipse.languageserver/plugin.xml
index ce50027..7ed9dcf 100644
--- a/org.eclipse.languageserver/plugin.xml
+++ b/org.eclipse.languageserver/plugin.xml
@@ -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">
@@ -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
@@ -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
diff --git a/org.eclipse.languageserver/pom.xml b/org.eclipse.languageserver/pom.xml
index f06ec86..f06f775 100644
--- a/org.eclipse.languageserver/pom.xml
+++ b/org.eclipse.languageserver/pom.xml
@@ -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>
   
diff --git a/pom.xml b/pom.xml
index bff7057..297f9f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/repository/category.xml b/repository/category.xml
index 67a47ad..a722010 100644
--- a/repository/category.xml
+++ b/repository/category.xml
@@ -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">
diff --git a/repository/pom.xml b/repository/pom.xml
index 50297fc..9aabb24 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -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>