From 79a9ef16582931044e0f65d182cafa1e54886dd1 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Mon, 30 Oct 2017 15:02:23 +0200 Subject: [PATCH 1/4] Use a more advanced TypeScript LS --- .../1.0.1/org.eclipse.che.ls.typescript.script.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh b/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh index 335a64b60d2..730d4df5ba7 100644 --- a/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh +++ b/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh @@ -26,7 +26,6 @@ unset PACKAGES command -v tar >/dev/null 2>&1 || { PACKAGES=${PACKAGES}" tar"; } command -v curl >/dev/null 2>&1 || { PACKAGES=${PACKAGES}" curl"; } -AGENT_BINARIES_URI=https://codenvy.com/update/repository/public/download/org.eclipse.che.ls.typescript.binaries/1.0.1 CHE_DIR=$HOME/che LS_DIR=${CHE_DIR}/ls-typescript LS_LAUNCHER=${LS_DIR}/launch.sh @@ -161,8 +160,16 @@ fi ### Install JS-TS LS ### ######################## -curl -s ${AGENT_BINARIES_URI} | tar xzf - -C ${LS_DIR} +# Check if tsserver and typescript-language-server are installed + +unset TS_NPMS +command -v tsserver >/dev/null 2>&1 || { TS_NPMS=${TS_NPMS}" typescript"; } +command -v typescript-language-server >/dev/null 2>&1 || { TS_NPMS=${TS_NPMS}" typescript-language-server"; } + +test "${TS_NPMS}" = "" || { + ${SUDO} npm install -g ${TS_NPMS}; + } touch ${LS_LAUNCHER} chmod +x ${LS_LAUNCHER} -echo "nodejs ${LS_DIR}/build/language-server-stdio.js" > ${LS_LAUNCHER} +echo "typescript-language-server --stdio" > ${LS_LAUNCHER} \ No newline at end of file From 5c79dbf405c423173b8fec2386fe9c913ebbc918 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Mon, 30 Oct 2017 15:56:48 +0200 Subject: [PATCH 2/4] Use a more advanced TypeScript LS --- .../installers/1.0.1/org.eclipse.che.ls.typescript.script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh b/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh index 730d4df5ba7..59774eac2a6 100644 --- a/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh +++ b/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh @@ -172,4 +172,4 @@ test "${TS_NPMS}" = "" || { touch ${LS_LAUNCHER} chmod +x ${LS_LAUNCHER} -echo "typescript-language-server --stdio" > ${LS_LAUNCHER} \ No newline at end of file +echo "typescript-language-server --stdio" > ${LS_LAUNCHER} From 32fca1d52a42465121fb73e383f5dff6e16f0726 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Mon, 30 Oct 2017 15:58:41 +0200 Subject: [PATCH 3/4] Use a more advanced TypeScript LS --- .../installers/1.0.1/org.eclipse.che.ls.typescript.script.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh b/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh index 59774eac2a6..ea332c9fc1f 100644 --- a/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh +++ b/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh @@ -173,3 +173,4 @@ test "${TS_NPMS}" = "" || { touch ${LS_LAUNCHER} chmod +x ${LS_LAUNCHER} echo "typescript-language-server --stdio" > ${LS_LAUNCHER} + From d7923b99acabede73ce1c77e9f36becf533ba308 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Mon, 30 Oct 2017 15:59:41 +0200 Subject: [PATCH 4/4] Use a more advanced TypeScript LS --- .../installers/1.0.1/org.eclipse.che.ls.typescript.script.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh b/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh index ea332c9fc1f..59774eac2a6 100644 --- a/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh +++ b/agents/ls-typescript/src/main/resources/installers/1.0.1/org.eclipse.che.ls.typescript.script.sh @@ -173,4 +173,3 @@ test "${TS_NPMS}" = "" || { touch ${LS_LAUNCHER} chmod +x ${LS_LAUNCHER} echo "typescript-language-server --stdio" > ${LS_LAUNCHER} -