Fixing of issue 280

.travis.yml

@@ -36,7 +36,7 @@ jobs:
       - cd $TRAVIS_BUILD_DIR/extensions/vscode
       - ./gradlew vscodeExtension
       - cd $TRAVIS_BUILD_DIR
-      - cp -r plugins/com.yakindu.solidity.ide/target/languageserver extensions/theia/xtext-dsl-extension/lsp
+      - cp -r plugins/com.yakindu.solidity.ide/target/languageserver extensions/theia/xtext-dsl-extension/languageserver
       - cd extensions/theia/
       - yarn install
       - cd $TRAVIS_BUILD_DIR

extensions/theia/.gitignore

@@ -6,5 +6,5 @@
 */lsp/
 */examples/
 /node_modules/
-/xtext-dsl-extension/lsp
+/xtext-dsl-extension/languageserver
 /com.yakindu.solidity.web.ide.docker.tar.gz

extensions/theia/xtext-dsl-extension/package.json

@@ -19,7 +19,7 @@
   },
   "scripts": {
     "prepare": "yarn run clean && yarn run build",
-    "copy-ls": "rimraf lsp && mkdir lsp && cp -r ../../../../plugins/com.yakindu.solidity.ide/target/languageserver/* ./lsp/",
+    "copy-ls": "rimraf lsp && mkdir languageserver && cp -r ../../../../plugins/com.yakindu.solidity.ide/target/languageserver/* ./languageserver/",
     "clean": "rimraf lib",
     "build": "tsc",
     "local": "tsc && yarn run copy-ls",

extensions/theia/xtext-dsl-extension/src/node/solidity-contribution.ts

@@ -76,8 +76,8 @@ export class SolidityContribution extends BaseLanguageServerContribution {
         } else {
             const ops = os.platform();
 
-            let command = path.resolve(__dirname, '../../lsp/bin/solidity-ls');
-            if (ops.toLowerCase().includes("win")){
+            let command = path.resolve(__dirname, '../../languageserver/bin/solidity-ls');
+            if (ops == "win32"){
                 command += ".bat"
             }
 

features/com.yakindu.solidity.solc.feature/feature.xml

@@ -712,7 +712,7 @@ Public License instead of this License.  But first, please read
          unpack="false"/>
 
    <plugin
-         id="com.yakindu.solidity.solc.win.fragment"
+         id="com.yakindu.solidity.solc.win32.fragment"
          os="win32"
          arch="x86_64"
          download-size="0"
@@ -722,7 +722,7 @@ Public License instead of this License.  But first, please read
          unpack="false"/>
 
    <plugin
-         id="com.yakindu.solidity.solc.mac.fragment"
+         id="com.yakindu.solidity.solc.macosx.fragment"
          os="macosx"
          arch="x86_64"
          download-size="0"

plugins/com.yakindu.sct.domain.solidity.ui/META-INF/MANIFEST.MF

@@ -22,3 +22,4 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: com.yakindu.sct.domain.solidity.ui
+Export-Package: com.yakindu.sct.domain.solidity.ui

plugins/com.yakindu.solidity.ide/META-INF/MANIFEST.MF

@@ -6,6 +6,7 @@ Bundle-Version: 0.7.3.qualifier
 Bundle-SymbolicName: com.yakindu.solidity.ide;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.yakindu.solidity,
+ com.yakindu.solidity.solc;bundle-version="0.7.3",
  org.eclipse.xtext.ide,
  org.eclipse.xtend.lib,
  org.eclipse.xtext.xbase.lib,
@@ -14,11 +15,13 @@ Require-Bundle: com.yakindu.solidity,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  com.google.gson,
  org.eclipse.emf.ecore.change,
- org.slf4j.api;bundle-version="1.7.2"
+ org.slf4j.api;bundle-version="1.7.2",
+ org.eclipse.equinox.preferences;bundle-version="3.7.400",
+ org.apache.commons.lang;bundle-version="2.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: com.yakindu.solidity.ide.contentassist.antlr,
+Export-Package: com.yakindu.solidity.ide,
+ com.yakindu.solidity.ide.contentassist.antlr,
  com.yakindu.solidity.ide.contentassist.antlr.internal
 Automatic-Module-Name: com.yakindu.solidity.ide
-Bundle-ClassPath: lib/Java-WebSocket-1.4.0.jar,
- .
+Bundle-ClassPath: lib/Java-WebSocket-1.4.0.jar,.
 

plugins/com.yakindu.solidity.ide/pom.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.yakindu.solidity</groupId>
@@ -35,13 +36,13 @@
 		</dependency>
 		<dependency>
 			<groupId>com.yakindu.solidity</groupId>
-			<artifactId>com.yakindu.solidity.solc.mac.fragment</artifactId>
+			<artifactId>com.yakindu.solidity.solc.macosx.fragment</artifactId>
 			<version>0.7.3-SNAPSHOT</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.yakindu.solidity</groupId>
-			<artifactId>com.yakindu.solidity.solc.win.fragment</artifactId>
+			<artifactId>com.yakindu.solidity.solc.win32.fragment</artifactId>
 			<version>0.7.3-SNAPSHOT</version>
 			<optional>true</optional>
 		</dependency>
@@ -83,7 +84,6 @@
 					</filesets>
 				</configuration>
 			</plugin>
-
 			<plugin>
 				<groupId>org.eclipse.xtend</groupId>
 				<artifactId>xtend-maven-plugin</artifactId>
@@ -95,73 +95,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.0.1</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/libs</outputDirectory>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>false</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-							<excludeTransitive>true</excludeTransitive>
-							<excludeArtifactIds>
-								com.ibm.icu,
-								org.apache.ant,
-								org.apache.commons.lang,
-								org.apache.commons.logging,
-								org.eclipse.core.commands,
-								org.eclipse.core.contenttype,
-								org.eclipse.core.expressions,
-								org.eclipse.core.filesystem,
-								org.eclipse.core.variables,
-								org.eclipse.debug.core,
-								org.eclipse.emf.codegen.ecore,
-								org.eclipse.emf.codegen,
-								org.eclipse.emf.mwe.core,
-								org.eclipse.emf.mwe.utils,
-								org.eclipse.emf.mwe2.lib,
-								org.eclipse.emf.mwe2.runtime,
-								org.eclipse.equinox.app,
-								org.eclipse.equinox.registry,
-								org.eclipse.jdt.core,
-								org.eclipse.jdt.debug,
-								org.eclipse.jdt.launching,
-								org.eclipse.text,
-								org.eclipse.xtend.typesystem.emf,
-								org.eclipse.xtend,
-							</excludeArtifactIds>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>com.googlecode.addjars-maven-plugin</groupId>
-				<artifactId>addjars-maven-plugin</artifactId>
-				<version>1.0.5</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>add-jars</goal>
-						</goals>
-						<configuration>
-							<resources>
-								<resource>
-									<directory>${project.build.directory}/libs</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>appassembler-maven-plugin</artifactId>
@@ -173,26 +106,72 @@
 							<goal>assemble</goal>
 						</goals>
 						<configuration>
+							<useAllProjectDependencies>true</useAllProjectDependencies>
+							<projectArtifactFirstInClassPath>true</projectArtifactFirstInClassPath>
 							<assembleDirectory>${project.build.directory}/languageserver</assembleDirectory>
 							<repositoryLayout>flat</repositoryLayout>
-							<useWildcardClassPath>true</useWildcardClassPath>
-							<!-- uncomment to enable remote debugging <extraJvmArguments>-Xdebug 
-								-Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000</extraJvmArguments> -->
+							<!--<extraJvmArguments>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</extraJvmArguments>-->
 							<programs>
 								<program>
 									<id>solidity-ls</id>
 									<!-- Use RunServer for Socket connection -->
-									<!-- <mainClass>com.yakindu.solidity.ide.RunServer</mainClass> -->
-									<mainClass>org.eclipse.xtext.ide.server.ServerLauncher</mainClass>
-									<!-- uncomment to enable options <commandLineArguments> <commandLineArgument>-trace</commandLineArgument> 
-										<commandLineArgument>-log</commandLineArgument> <commandLineArgument>-noValidate</commandLineArgument> 
-										</commandLineArguments> -->
+									<mainClass>com.yakindu.solidity.ide.LanguageServerLauncher</mainClass>
+									<!-- <mainClass>org.eclipse.xtext.ide.server.ServerLauncher</mainClass> -->
+									<commandLineArguments>
+										<commandLineArgument>-trace</commandLineArgument>
+										<commandLineArgument>-log</commandLineArgument>
+										<!-- <commandLineArgument>-noValidate</commandLineArgument> -->
+										<!-- Compiler path is given with ${os} variable, so the respective 
+											os-specific compiler can be located. The language server will resolve the 
+											variable. -->
+										<commandLineArgument>-compiler repo/com.yakindu.solidity.solc.\${os}.fragment/compiler/solc</commandLineArgument>
+									</commandLineArguments>
 								</program>
 							</programs>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.8</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<configuration>
+							<tasks>
+								<unzip
+									dest="${project.build.directory}/languageserver/repo/com.yakindu.solidity.solc.macosx.fragment">
+									<fileset
+										dir="${project.build.directory}/languageserver/repo/">
+										<include
+											name="com.yakindu.solidity.solc.macosx.fragment-**-SNAPSHOT.jar" />
+									</fileset>
+								</unzip>
+								<unzip
+									dest="${project.build.directory}/languageserver/repo/com.yakindu.solidity.solc.linux.fragment">
+									<fileset
+										dir="${project.build.directory}/languageserver/repo/">
+										<include
+											name="com.yakindu.solidity.solc.linux.fragment-**-SNAPSHOT.jar" />
+									</fileset>
+								</unzip>
+								<unzip
+									dest="${project.build.directory}/languageserver/repo/com.yakindu.solidity.solc.win32.fragment">
+									<fileset
+										dir="${project.build.directory}/languageserver/repo/">
+										<include
+											name="com.yakindu.solidity.solc.win32.fragment-**-SNAPSHOT.jar" />
+									</fileset>
+								</unzip>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

plugins/com.yakindu.solidity.ide/src/com/yakindu/solidity/ide/LanguageServerLauncher.java

@@ -0,0 +1,95 @@
+package com.yakindu.solidity.ide;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.lang.SystemUtils;
+import org.eclipse.xtext.ide.server.ServerLauncher;
+import org.eclipse.xtext.ide.server.ServerModule;
+import org.eclipse.xtext.util.Modules2;
+
+import com.google.inject.Guice;
+import com.yakindu.solidity.SolidityRuntimeModule;
+import com.yakindu.solidity.solc.preferences.ICompilerPreferences;
+
+/**
+ * @author Jonathan Thoene - Initial contribution and API
+ */
+public class LanguageServerLauncher {
+
+	public static final String COMPILER = "-compiler";
+
+	public static void main(String[] args) throws InterruptedException, IOException {
+		try {
+			Options o = new Options();
+			o.addOption(ServerLauncher.LOG.substring(1), false, "Log");
+			o.addOption(ServerLauncher.TRACE.substring(1), false, "Trace");
+			o.addOption(ServerLauncher.NO_VALIDATE.substring(1), false, "No Validate");
+			o.addOption(COMPILER.substring(1), true, "Path to Solc Compiler (relative to working dir)");
+			CommandLineParser p = new BasicParser();
+			CommandLine cmd = p.parse(o, args);
+			if (cmd.hasOption(COMPILER.substring(1))) {
+				String compilerPath = cmd.getOptionValue(COMPILER.substring(1)).replace("${os}", getOS());
+				String absoluteCompilerPath = getWorkDir() + compilerPath;
+				ICompilerPreferences prefs = Guice
+						.createInjector(Modules2.mixin(new SolidityRuntimeModule(), new SolidityIdeModule()))
+						.getInstance(ICompilerPreferences.class);
+				prefs.getPreferences().put(ICompilerPreferences.COMPILER_PATH, absoluteCompilerPath);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		ServerLauncher.launch(LanguageServerLauncher.class.getName(), args, new ServerModule());
+		/*
+		 * Injector injector = Guice.createInjector(new ServerModule());
+		 * LanguageServerImpl languageServer =
+		 * injector.getInstance(LanguageServerImpl.class); Function<MessageConsumer,
+		 * MessageConsumer> wrapper = consumer -> { return message -> {
+		 * System.out.println(message); consumer.consume(message); }; };
+		 * Launcher<LanguageClient> launcher = createSocketLauncher(languageServer,
+		 * LanguageClient.class, new InetSocketAddress("localhost", 5007),
+		 * Executors.newCachedThreadPool(), wrapper);
+		 * languageServer.connect(launcher.getRemoteProxy()); Future<?> future =
+		 * launcher.startListening(); while (!future.isDone()) { Thread.sleep(10_000l);
+		 * }
+		 */
+	}
+
+	private static String getWorkDir() throws IOException {
+		// TODO: app workdir should be configured in Maven to be language server dir,
+		// not theia app dir, so we do not have to compensate this here.
+		String appDir = new File(".").getCanonicalPath();
+		return appDir.substring(0, appDir.indexOf("app")) + "xtext-dsl-extension/languageserver/";
+	}
+
+	private static CharSequence getOS() {
+		if (SystemUtils.IS_OS_LINUX) {
+			return "linux";
+		} else if (SystemUtils.IS_OS_WINDOWS) {
+			return "win32";
+		} else if (SystemUtils.IS_OS_MAC || SystemUtils.IS_OS_MAC_OSX) {
+			return "macosx";
+		} else {
+			throw new IllegalArgumentException("Unsupported OS");
+		}
+	}
+
+	/*
+	 * static <T> Launcher<T> createSocketLauncher(Object localService, Class<T>
+	 * remoteInterface, SocketAddress socketAddress, ExecutorService
+	 * executorService, Function<MessageConsumer, MessageConsumer> wrapper) throws
+	 * IOException { AsynchronousServerSocketChannel serverSocket =
+	 * AsynchronousServerSocketChannel.open().bind(socketAddress);
+	 * AsynchronousSocketChannel socketChannel; try { socketChannel =
+	 * serverSocket.accept().get(); return Launcher.createIoLauncher(localService,
+	 * remoteInterface, Channels.newInputStream(socketChannel),
+	 * Channels.newOutputStream(socketChannel), executorService, wrapper); } catch
+	 * (InterruptedException | ExecutionException e) { e.printStackTrace(); } return
+	 * null; }
+	 */
+
+}