Skip to content

Commit 2c58077

Browse files
mickaelistriamickaelistria
committed
Issue #29: Separate language-specific content and APIs.
1 parent c5ef849 commit 2c58077

File tree

14 files changed

+194
-59
lines changed

14 files changed

+194
-59
lines changed

‎org.eclipse.languageserver.languages/.classpath

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
4+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5+
<classpathentry kind="src" path="src"/>
6+
<classpathentry kind="output" path="bin"/>
7+
</classpath>

‎org.eclipse.languageserver.languages/.project

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.eclipse.languageserver.languages</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.pde.ManifestBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.pde.SchemaBuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
</buildSpec>
24+
<natures>
25+
<nature>org.eclipse.pde.PluginNature</nature>
26+
<nature>org.eclipse.jdt.core.javanature</nature>
27+
</natures>
28+
</projectDescription>

‎org.eclipse.languageserver.languages/META-INF/MANIFEST.MF

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: Support for Languages using Language Servers (C#, CSS, LESS, SCSS, JSON)
4+
Bundle-SymbolicName: org.eclipse.languageserver.languages;singleton:=true
5+
Bundle-Version: 0.1.0.qualifier
6+
Bundle-Vendor: Eclipse.org
7+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
8+
Require-Bundle: org.eclipse.core.runtime,
9+
org.eclipse.debug.core,
10+
org.eclipse.languageserver;bundle-version="0.1.0",
11+
org.eclipse.ui,
12+
org.apache.commons.io;bundle-version="2.2.0",
13+
org.eclipse.core.externaltools,
14+
org.eclipse.jface.text

‎org.eclipse.languageserver.languages/build.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
source.. = src/
2+
output.. = bin/
3+
bin.includes = META-INF/,\
4+
.,\
5+
plugin.xml

‎org.eclipse.languageserver.languages/plugin.xml

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<?eclipse version="3.4"?>
3+
<plugin>
4+
<extension
5+
point="org.eclipse.core.contenttype.contentTypes">
6+
<content-type
7+
base-type="org.eclipse.core.runtime.text"
8+
file-extensions="cs"
9+
id="org.eclipse.languageserver.languages.csharp"
10+
name="C Sharp"
11+
priority="normal">
12+
</content-type>
13+
<content-type
14+
base-type="org.eclipse.core.runtime.text"
15+
file-extensions="less"
16+
id="org.eclipse.languageserver.languages.less"
17+
name="LESS"
18+
priority="normal">
19+
</content-type>
20+
<content-type
21+
base-type="org.eclipse.core.runtime.text"
22+
file-extensions="scss,sass"
23+
id="org.eclipse.languageserver.languages.scss"
24+
name="SCSS/SASS"
25+
priority="normal">
26+
</content-type>
27+
</extension>
28+
<extension
29+
point="org.eclipse.ui.genericeditor.presentationReconcilers">
30+
<presentationReconciler
31+
class="org.eclipse.languageserver.languages.csharp.CSharpKeywordsHighlighter"
32+
contentType="org.eclipse.languageserver.languages.csharp">
33+
</presentationReconciler>
34+
</extension>
35+
<extension
36+
point="org.eclipse.ui.startup">
37+
<startup
38+
class="org.eclipse.languageserver.languages.InitializeLaunchConfigurations">
39+
</startup>
40+
</extension>
41+
<extension
42+
point="org.eclipse.ui.genericeditor.hoverProviders">
43+
<hoverProvider
44+
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
45+
contentType="org.eclipse.wst.css.core.csssource">
46+
</hoverProvider>
47+
<hoverProvider
48+
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
49+
contentType="org.eclipse.wst.jsdt.core.jsonSource">
50+
</hoverProvider>
51+
<hoverProvider
52+
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
53+
contentType="org.eclipse.languageserver.languages.csharp">
54+
</hoverProvider>
55+
<hoverProvider
56+
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
57+
contentType="org.eclipse.languageserver.languages.scss">
58+
</hoverProvider>
59+
<hoverProvider
60+
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
61+
contentType="org.eclipse.languageserver.languages.less">
62+
</hoverProvider>
63+
</extension>
64+
<extension
65+
point="org.eclipse.ui.genericeditor.contentAssistProcessors">
66+
<contentAssistProcessor
67+
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
68+
contentType="org.eclipse.wst.css.core.csssource">
69+
</contentAssistProcessor>
70+
<contentAssistProcessor
71+
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
72+
contentType="org.eclipse.wst.jsdt.core.jsonSource">
73+
</contentAssistProcessor>
74+
<contentAssistProcessor
75+
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
76+
contentType="org.eclipse.languageserver.languages.scss">
77+
</contentAssistProcessor>
78+
<contentAssistProcessor
79+
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
80+
contentType="org.eclipse.languageserver.languages.less">
81+
</contentAssistProcessor>
82+
<contentAssistProcessor
83+
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
84+
contentType="org.eclipse.languageserver.languages.csharp">
85+
</contentAssistProcessor>
86+
</extension>
87+
</plugin>

‎org.eclipse.languageserver.languages/pom.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<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">
2+
<modelVersion>4.0.0</modelVersion>
3+
<artifactId>org.eclipse.languageserver.languages</artifactId>
4+
<parent>
5+
<groupId>org.eclipse.languageserver</groupId>
6+
<artifactId>parent</artifactId>
7+
<version>0.1.0-SNAPSHOT</version>
8+
</parent>
9+
<packaging>eclipse-plugin</packaging>
10+
11+
<build>
12+
<plugins>
13+
<plugin>
14+
<groupId>org.eclipse.tycho</groupId>
15+
<artifactId>target-platform-configuration</artifactId>
16+
<version>0.25.0</version>
17+
<configuration>
18+
<pomDependencies>consider</pomDependencies>
19+
</configuration>
20+
</plugin>
21+
</plugins>
22+
</build>
23+
24+
<dependencies>
25+
<dependency>
26+
<groupId>com.google.code.gson</groupId>
27+
<artifactId>gson</artifactId>
28+
<version>2.5</version>
29+
</dependency>
30+
<dependency>
31+
<groupId>org.apache.servicemix.bundles</groupId>
32+
<artifactId>org.apache.servicemix.bundles.jsr305</artifactId>
33+
<version>3.0.1_1</version>
34+
</dependency>
35+
</dependencies>
36+
37+
</project>

‎org.eclipse.languageserver/src/org/eclipse/languageserver/languages/InitializeLaunchConfigurations.java renamed to ‎org.eclipse.languageserver.languages/src/org/eclipse/languageserver/languages/InitializeLaunchConfigurations.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void earlyStartup() {
7373
environment.put("LD_LIBRARY_PATH", "/home/mistria/apps/OmniSharp.NET/icu54:" + System.getenv("LD_LIBRARY_PATH"));
7474
workingCopy.setAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, environment);
7575
omniSharpLauch = workingCopy.doSave();
76-
registry.registerAssociation(contentTypeManager.getContentType("org.eclipse.languageserver.csharp"), LaunchConfigurationStreamProvider.findLaunchConfiguration(IExternalToolConstants.ID_PROGRAM_LAUNCH_CONFIGURATION_TYPE, InitializeLaunchConfigurations.OMNISHARP_NAME));
76+
registry.registerAssociation(contentTypeManager.getContentType("org.eclipse.languageserver.languages.csharp"), LaunchConfigurationStreamProvider.findLaunchConfiguration(IExternalToolConstants.ID_PROGRAM_LAUNCH_CONFIGURATION_TYPE, InitializeLaunchConfigurations.OMNISHARP_NAME));
7777
}
7878
} catch (CoreException e) {
7979
e.printStackTrace();
@@ -101,6 +101,8 @@ public void earlyStartup() {
101101
workingCopy.setAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, getVSCodeLocation() + "/resources/app/extensions/css/server/out/cssServerMain.js --stdio");
102102
omniSharpLauch = workingCopy.doSave();
103103
registry.registerAssociation(contentTypeManager.getContentType("org.eclipse.wst.css.core.csssource"), LaunchConfigurationStreamProvider.findLaunchConfiguration(IExternalToolConstants.ID_PROGRAM_LAUNCH_CONFIGURATION_TYPE, InitializeLaunchConfigurations.VSCODE_CSS_NAME));
104+
registry.registerAssociation(contentTypeManager.getContentType("org.eclipse.languageserver.languages.less"), LaunchConfigurationStreamProvider.findLaunchConfiguration(IExternalToolConstants.ID_PROGRAM_LAUNCH_CONFIGURATION_TYPE, InitializeLaunchConfigurations.VSCODE_CSS_NAME));
105+
registry.registerAssociation(contentTypeManager.getContentType("org.eclipse.languageserver.languages.scss"), LaunchConfigurationStreamProvider.findLaunchConfiguration(IExternalToolConstants.ID_PROGRAM_LAUNCH_CONFIGURATION_TYPE, InitializeLaunchConfigurations.VSCODE_CSS_NAME));
104106
}
105107
} catch (CoreException e) {
106108
e.printStackTrace();

‎org.eclipse.languageserver/src/org/eclipse/languageserver/languages/csharp/CSharpKeywordsHighlighter.java renamed to ‎org.eclipse.languageserver.languages/src/org/eclipse/languageserver/languages/csharp/CSharpKeywordsHighlighter.java

File renamed without changes.

‎org.eclipse.languageserver/META-INF/MANIFEST.MF

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
3-
Bundle-Name: Languageserver
3+
Bundle-Name: Language Server Protocol client for Eclipse
44
Bundle-SymbolicName: org.eclipse.languageserver;singleton:=true
5-
Bundle-Version: 1.0.0.qualifier
5+
Bundle-Version: 0.1.0.qualifier
66
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
77
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
88
org.eclipse.equinox.common;bundle-version="3.8.0",
@@ -32,3 +32,7 @@ Bundle-ClassPath: .
3232
Bundle-Localization: plugin
3333
Bundle-ActivationPolicy: lazy
3434
Bundle-Activator: org.eclipse.languageserver.LanguageServerPluginActivator
35+
Export-Package: org.eclipse.languageserver,
36+
org.eclipse.languageserver.operations.completion,
37+
org.eclipse.languageserver.operations.hover
38+
Bundle-Vendor: Eclipse.org

‎org.eclipse.languageserver/plugin.xml

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,6 @@
33
<plugin>
44
<!-- Extension point will ideally be "org.eclipse.text...." because
55
the feature should be part of the generic text editor -->
6-
<extension
7-
point="org.eclipse.ui.genericeditor.contentAssistProcessors">
8-
<contentAssistProcessor
9-
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
10-
contentType="org.eclipse.wst.css.core.csssource">
11-
</contentAssistProcessor>
12-
<contentAssistProcessor
13-
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
14-
contentType="org.eclipse.wst.jsdt.core.jsonSource">
15-
</contentAssistProcessor>
16-
<contentAssistProcessor
17-
class="org.eclipse.languageserver.operations.completion.LSContentAssistProcessor"
18-
contentType="org.eclipse.languageserver.csharp">
19-
</contentAssistProcessor>
20-
</extension>
21-
<extension
22-
point="org.eclipse.ui.genericeditor.hoverProviders">
23-
<hoverProvider
24-
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
25-
contentType="org.eclipse.wst.css.core.csssource">
26-
</hoverProvider>
27-
<hoverProvider
28-
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
29-
contentType="org.eclipse.wst.jsdt.core.jsonSource">
30-
</hoverProvider>
31-
<hoverProvider
32-
class="org.eclipse.languageserver.operations.hover.LSBasedHover"
33-
contentType="org.eclipse.languageserver.csharp">
34-
</hoverProvider>
35-
</extension>
366
<extension
377
id="diagnostic"
388
point="org.eclipse.core.resources.markers">
@@ -47,16 +17,6 @@
4717
markerType="org.eclipse.languageserver.diagnostic">
4818
</markerResolutionGenerator>
4919
</extension>
50-
<extension
51-
point="org.eclipse.core.contenttype.contentTypes">
52-
<content-type
53-
base-type="org.eclipse.core.runtime.text"
54-
file-extensions="cs"
55-
id="org.eclipse.languageserver.csharp"
56-
name="C Sharp"
57-
priority="normal">
58-
</content-type>
59-
</extension>
6020
<extension
6121
point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
6222
<hyperlinkDetector
@@ -128,19 +88,6 @@
12888
searchResultClass="org.eclipse.languageserver.operations.references.LSSearchResult">
12989
</viewPage>
13090
</extension>
131-
<extension
132-
point="org.eclipse.ui.genericeditor.presentationReconcilers">
133-
<presentationReconciler
134-
class="org.eclipse.languageserver.languages.csharp.CSharpKeywordsHighlighter"
135-
contentType="org.eclipse.languageserver.csharp">
136-
</presentationReconciler>
137-
</extension>
138-
<extension
139-
point="org.eclipse.ui.startup">
140-
<startup
141-
class="org.eclipse.languageserver.languages.InitializeLaunchConfigurations">
142-
</startup>
143-
</extension>
14491
<extension
14592
point="org.eclipse.ui.preferencePages">
14693
<page

‎org.eclipse.languageserver/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.eclipse.languageserver</groupId>
66
<artifactId>parent</artifactId>
7-
<version>1.0.0-SNAPSHOT</version>
7+
<version>0.1.0-SNAPSHOT</version>
88
</parent>
99
<packaging>eclipse-plugin</packaging>
1010

‎pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.eclipse.languageserver</groupId>
44
<artifactId>parent</artifactId>
5-
<version>1.0.0-SNAPSHOT</version>
5+
<version>0.1.0-SNAPSHOT</version>
66
<packaging>pom</packaging>
77

88
<modules>
99
<module>org.eclipse.languageserver</module>
10+
<module>org.eclipse.languageserver.languages</module>
1011
<module>repository</module>
1112
</modules>
1213
<build>

‎repository/category.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<bundle id="org.eclipse.languageserver">
55
<category name="Language Server Support for Eclipse"/>
66
</bundle>
7+
<bundle id="org.eclipse.languageserver.languages">
8+
<category name="Language Server Support for Eclipse"/>
9+
</bundle>
710

811
<category-def name="deps" label="Dependencies"/>
912
<bundle id="io.typefox.lsapi">

‎repository/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.eclipse.languageserver</groupId>
66
<artifactId>parent</artifactId>
7-
<version>1.0.0-SNAPSHOT</version>
7+
<version>0.1.0-SNAPSHOT</version>
88
</parent>
99
<packaging>eclipse-repository</packaging>
1010

0 commit comments

Comments
 (0)