Merge branch 'master' into docker

Add docker configuration to Travis deployments and use Maven publish
plugin to deploy to the GitHub package repo

Author: fwcd

.editorconfig

@@ -0,0 +1,12 @@
+root=true
+
+[*]
+charset=utf-8
+end_of_line=lf
+insert_final_newline=true
+indent_style=space
+indent_size=4
+trim_trailing_whitespace=true
+
+[.travis.yml]
+indent_size=2

.gitignore

@@ -1,20 +1,21 @@
-.settings/
+.settings
 .classpath
 .project
 .factorypath
 .gradle
 
-.idea/
+.idea
 *.iml
 
-lib-kotlin/
-bin/
-build/
-target/
-out/
+lib-kotlin
+bin
+build
+target
+out
+__pycache__
 *.vsix
 
-node_modules/
-.vscode-test/
+node_modules
+.vscode-test
 
-.DS_STORE
+.DS_Store

.travis.yml

@@ -1,10 +1,47 @@
 language: java
+dist: trusty
 
 services:
   - docker
 
+jdk:
+  - openjdk8
+  - oraclejdk11
+
+env: NODE_VERSION=10.2.1
+before_install: nvm install $NODE_VERSION
 script:
-  - ./gradlew build
-  - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
-  - docker build ./ -t donniewest/kotlinlanguageserver:latest
-  - docker push donniewest/kotlinlanguageserver:latest
+  - ./gradlew :shared:test -i
+  - ./gradlew :server:test -i
+
+jobs:
+  include:
+    - stage: "Deploy"
+      before_deploy:
+        - ./gradlew :server:distZip
+        - ./gradlew :grammars:distZip
+        - docker login docker.pkg.github.com -u fwcd -p "$DOCKER_PASSWORD"
+        - docker build -t docker.pkg.github.com/fwcd/kotlin-language-server:latest .
+        - docker push fwcd/kotlin-language-server:latest
+      deploy:
+        - provider: releases
+          api_key:
+            secure: "DQLsAAtr2u2X494FOR1Q3P181M+dWbT7jLkxJRxrgRQdGipeYcUp0c9/+uyEF7o4N3i4uCAWSh4yHJ0hGtOir/L9vd/EljftIU8d/qxDduuw9mmt6/7tVOzuQ3I8+Zap5XVXgDDSO0fsiwEBEShTbqCEdhzNJ2ZVbgd/C1N8dOfObmcRHtGuxox35TmbLlOoPCXEqsnirQFxxyH5e/G2DTnrUBpZ5ZeCJJsPzVxZzvTOMPwW4EeuOk9vYPPYQqfpQdJYiSwrlN+s6ELHHs7rJQhXUAzjiaJN5C/JxEPeCcFGZ9kak168tFp8ud6l+TGaT2ViuvChWIbKb3rJvHfIIKRtDGXi6vSR55Zj0p+EelIStRsUarru/Mhewocawmlwh4RPWvefD27FntHvzCW8tC2WoBo1VMYZdQ1Qcla/QN5psyLSr8XlaeFfBZgo66rctwb0opDtDROZ0oqlYq+CMcWEj0/TtRpQxWyzlNj2r4AomGKoqtaQWXfErMKbr3m24NhSq+4IWb7m8dx6WhcFOpTaWMmGyGoGDu8RNBQerigj2qd8hoIeC9U0VJNSh3DzF12jj3cYoIT4PVwAibQHIz9dhIMjdgwDgRKFGH/PFtKSPXVAtQGhfJA6gP/6qCMMEKHRYeFExhlCJtko0zBxeBToqJoEqKVojb72dclFG5o="
+          file_glob: true
+          file:
+            - "server/build/distributions/*.zip"
+            - "grammars/build/distributions/*.zip"
+          skip_cleanup: true
+          name: "Version $TRAVIS_TAG"
+          on:
+            tags: true
+            repo: fwcd/kotlin-language-server
+        - provider: script
+          script:
+            - ./gradlew :shared:publish
+          skip_cleanup: true
+        - provider: script
+          script:
+            - docker login docker.pkg.github.com -u fwcd -p "$DOCKER_PASSWORD"
+            - docker build -t docker.pkg.github.com/fwcd/kotlin-language-server:latest .
+            - docker push fwcd/kotlin-language-server:latest

.vscode/launch.json

@@ -1,36 +1,26 @@
-// A launch configuration that compiles the extension and then opens it inside a new window
-// Use IntelliSense to learn about possible attributes.
-// Hover to view descriptions of existing attributes.
-// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
 {
-	"version": "0.2.0",
+    "version": "0.2.0",
     "configurations": [
         {
-            "name": "Extension",
-            "type": "extensionHost",
+            "type": "kotlin",
             "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": [
-                "--extensionDevelopmentPath=${workspaceFolder}"
-            ],
-            "outFiles": [
-                "${workspaceFolder}/out/**/*.js"
-            ],
-            "preLaunchTask": "npm: watch"
+            "name": "Kotlin Launch",
+            "projectRoot": "${workspaceFolder}/server",
+            "mainClass": "org.javacs.kt.MainKt"
         },
         {
-            "name": "Extension Tests",
-            "type": "extensionHost",
-            "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": [
-                "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/out/test"
-            ],
-            "outFiles": [
-                "${workspaceFolder}/out/test/**/*.js"
-            ],
-            "preLaunchTask": "npm: watch"
+            "type": "java",
+            "name": "Attach Kotlin Language Server",
+            "request": "attach",
+            "hostName": "localhost",
+            "port": 8000
+        },
+        {
+            "type": "java",
+            "name": "Debug Tests",
+            "request": "attach",
+            "hostName": "localhost",
+            "port": 5005
         }
     ]
 }

.vscode/settings.json

@@ -3,24 +3,15 @@
 {
     "version": "2.0.0",
     "tasks": [
-        {
-            "type": "npm",
-            "script": "watch",
-            "problemMatcher": "$tsc-watch",
-            "isBackground": true,
-            "presentation": {
-                "reveal": "never"
-            }
-        },
         {
             "label": "Build with Gradle",
             "type": "shell",
-            "command": "gradle build -x test",
+            "command": "gradle build",
             "problemMatcher": [],
             "group": {
                 "kind": "build",
                 "isDefault": true
             }
         }
     ]
-}
+}

.vscode/tasks.json

@@ -1,31 +1,51 @@
 # Building
-Contains the commands require to build this project. Note that you might need to use `gradlew` instead of `./gradlew` when running on `cmd.exe`.
+Describes how to build and run the language server and the editor extensions.
 
-## Setting up the development environment
-* Java should be installed and located under JAVA_HOME or PATH
+## Setup
+* Java 8+ should be installed and located under `JAVA_HOME` or `PATH`.
+* Note that you might need to use `gradlew` instead of `./gradlew` for the commands on Windows.
 
-### For language server development
-* `./gradlew install`
+## Language Server
 
-### For extension development
-* VSCode is required
-* `npm install`
-* `npm install -g vsce`
+### Building
+If you just want to build the language server and use its binaries in your client of choice, run:
 
-## Building the Language Server
-* With Testing:
-    * `./gradlew build`
-* Without Testing:
-    * `./gradlew build -x test`
-* Start scripts for the language server are located under `build/install/kotlin-language-server/bin/`
+>`./gradlew :server:installDist`
 
-## Testing the Language Server
-* `./gradlew test`
+The language server executable is now located under `server/build/install/server/bin/kotlin-language-server`. (Depending on your language client, you might want to add it to your `PATH`)
 
-## Running/Debugging the VSCode extension
-* Open the debug tab in VSCode
-* Run the `Extension` launch configuration
+Note that there are external dependent libraries, so if you want to put the server somewhere else, you have to move the entire `install`-directory.
 
-## Packaging the VSCode extension
-* `vsce package -o build.vsix`
-* The extension is located as `build.vsix` in the repository folder
+### Packaging
+To create a ZIP-archive of the language server, run:
+
+>`./gradlew :server:distZip`
+
+## Grammars
+
+### Packaging
+To create a ZIP-archive of the grammars, run:
+
+>`./gradlew :grammars:distZip`
+
+## Gradle Tasks
+This paragraph assumes that you are familiar with Gradle's [task system](https://docs.gradle.org/current/userguide/build_lifecycle.html). In short: Every task describes an atomic piece of work and may depend on other tasks. Task dependencies will automatically be executed. The following subsections describe the available tasks for each module of this project.
+
+### Language Server (:server)
+
+| Task | Command | Description |
+| ---- | ------- | ----------- |
+| Package | `./gradlew :server:installDist` | Packages the language server as a bundle of JAR files (e.g. for use with an editor extension) |
+| Package for Debugging | `./gradlew :server:installDebugDist` | Packages the language server with a debug launch configuration |
+| Test | `./gradlew :server:test` | Executes all unit tests |
+| Run | `./gradlew :server:run` | Runs the standalone language server from the command line |
+| Debug | `./gradlew :server:debugRun` | Launches the standalone language server from the command line using a debug configuration |
+| Build | `./gradlew :server:build` | Builds, tests and packages the language server |
+| Package for Release | `./gradlew :server:distZip` | Creates a release zip in `server/build/distributions`. If any dependencies have changed since the last release, a new license report should be generated and placed in `src/main/dist` before creating the distribution. |
+| Generate License Report | `./gradlew :server:licenseReport` | Generates a license report from the dependencies in `server/build/reports/licenses` |
+
+### Grammars (:grammars)
+
+| Task | Command | Description |
+| ---- | ------- | ----------- |
+| Package for Release | `./gradlew :grammars:distZip` | Creates a zip of the grammars in `grammars/build/distributions` |

.vscodeignore

@@ -1,8 +1,58 @@
 # Change Log
-All notable changes to the "kotlin" extension will be documented in this file.
+All notable changes to the language server will be documented in this file.
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+## [0.4.0]
+- Add support for Kotlin DSL buildscripts
+- Add support for non-Maven/Gradle projects
+- Improve Java-to-Kotlin converter
+- Use the Field icon instead of Property icon in completion lists
+- Add experimental support for multiplatform projects
+- Introduce the 'kls' URI scheme
+
+## [0.3.0]
+- Improve trailing lambda completions
+- Provide completions for generic extension methods
+
+## [0.2.9]
+- Include a grammar ZIP in the release assets
+
+## [0.2.8]
+- Include grammars distribution in release
+
+## [0.2.7]
+- Improve release naming
+
+## [0.2.6]
+- Remove version postfix from ZIP distributions
+
+## [0.2.5]
+- Move editor extensions into separate repositories
+
+## [0.2.0]
+- Rewrite Java-to-Kotlin converter from scratch
+- Implement Kotlin formatter
+- Add keyword completions
+- Make completions more reliable
+
+## [0.1.13]
+- Kotlin 1.3.11 support
+- Detailed completion signatures for overloaded methods
+- Updated to VSCode ^1.30.2
+- Improved dependency resolution logs
+
+## [0.1.12]
+- Kotlin 1.2.70 support
+
+## [0.1.11]
+- Improved keyword syntax highlighting
+
+## [0.1.10]
+- More compact distribution
+- Security fixes
+- Fixed decompiler
+
 ## [0.1.6]
 - Bugfixes related to Gradle dependency resolution in combination with Android projects
 

BUILDING.md

@@ -0,0 +1,45 @@
+# Editor Integration
+
+## Visual Studio Code
+See [vscode-kotlin-ide](https://github.com/fwcd/vscode-kotlin-ide) or install the extension from the [marketplace](https://marketplace.visualstudio.com/items?itemName=fwcd.kotlin).
+
+## Atom
+See [atom-ide-kotlin](https://github.com/fwcd/atom-ide-kotlin).
+
+## Emacs
+_using [`lsp-mode`](https://github.com/emacs-lsp/lsp-mode)_
+
+Add the language server executable to your `PATH`.
+
+## Vim
+_using [`LanguageClient-neovim`](https://github.com/autozimu/LanguageClient-neovim)_
+
+Add the language server to your `PATH` and include the following configuration in your `.vimrc`:
+
+```vim
+autocmd BufReadPost *.kt setlocal filetype=kotlin
+
+let g:LanguageClient_serverCommands = {
+    \ 'kotlin': ["kotlin-language-server"],
+    \ }
+```
+
+_using [`coc.nvim`](https://github.com/neoclide/coc.nvim)_
+
+Add the following to your coc-settings.json file:
+
+```json
+{
+    "languageserver": {
+        "kotlin": {
+            "command": "[path to cloned language server]/server/build/install/server/bin/kotlin-language-server",
+            "filetypes": ["kotlin"]
+        }
+    }
+}
+```
+
+Note that you may need to substitute `kotlin-language-server` with `kotlin-language-server.bat` on Windows.
+
+## Other Editors
+Install a [Language Server Protocol client](https://microsoft.github.io/language-server-protocol/implementors/tools/) for your tool. Then invoke the language server executable in a client-specific way. The server uses `stdio` to send and receive `JSON-RPC` messages.