Merge branch 'master' into enter-handler

# Conflicts:
#	resources/META-INF/plugin.xml

README.md

@@ -2,21 +2,24 @@
 
 ## Building from the source
 
-1. Clone the repository.
-2. Make sure that the bundled Plugin DevKit plugin is enabled in IDEA.
+1. Clone the repository using the following command.
+```
+git clone --recursive https://github.com/ballerinalang/plugin-intellij.git
+```
+2. Make sure that the bundled **Plugin DevKit** plugin is enabled in IDEA.
 3. Open the project in IDEA.
 4. Configure a common JDK and an IntelliJ Platform SDK. 
 
    This can be done in **File -> Project Structure -> SDKs**.
 
    For the IntelliJ Platform SDK, you may need to specify the directory containing the installed version of IntelliJ IDEA. By default it should offer the directory of the currently running version of IntelliJ IDEA.
 5. Build the project using **Build -> Build Project**.
-6. Run **Build -> Prepare Plugin Module 'ballerina-idea-plugin' For Deployment**. 
-7. In the project root directory, **ballerina-idea-plugin.jar** will be created.
+6. Run **Build -> Prepare Plugin Module 'Ballerina-intellij-plugin' For Deployment**. 
+7. In the project root directory, **Ballerina-intellij-plugin.zip** will be created.
 
 ## Installing the plugin to IDEA
 1. Go to **File -> Settings** and select **Plugins**.
-2. Click **Install plugin from disc** button and select the deployed plugin jar file.
+2. Click **Install plugin from disc** button and select the deployed **plugin zip** file. Please make sure to install the Zip file, not the extracted Jar files. This zip contains an additional library as well. Without this library, the plugin will not work properly.
 3. Restart IDEA.
 
 ## Running the plugin without building
@@ -29,7 +32,7 @@
 Pull requests are highly encouraged and we recommend you to create a GitHub issue to discuss the issue or feature that you are contributing to.
 
 ## License
-Ballerina IDEA plugin is available under the Apache 2.0 License.
+Ballerina IDEA plugin source is available under the Apache 2.0 License.
 
 ## Copyright
 Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.

gen/org/ballerinalang/plugins/idea/grammar/Ballerina.tokens

@@ -26,7 +26,7 @@ THROW=25
 THROWS=26
 TIMEOUT=27
 TRY=28
-TYPECONVERTOR=29
+TYPEMAPPER=29
 WHILE=30
 WORKER=31
 SENDARROW=32
@@ -101,7 +101,7 @@ ERRCHAR=76
 'throws'=26
 'timeout'=27
 'try'=28
-'typeconvertor'=29
+'typemapper'=29
 'while'=30
 'worker'=31
 '->'=32

gen/org/ballerinalang/plugins/idea/grammar/BallerinaBaseListener.java

@@ -244,61 +244,61 @@ public class BallerinaBaseListener implements BallerinaListener {
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterTypeConvertorDefinition(BallerinaParser.TypeConvertorDefinitionContext ctx) { }
+	@Override public void enterTypeMapperDefinition(BallerinaParser.TypeMapperDefinitionContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitTypeConvertorDefinition(BallerinaParser.TypeConvertorDefinitionContext ctx) { }
+	@Override public void exitTypeMapperDefinition(BallerinaParser.TypeMapperDefinitionContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterNativeTypeConvertor(BallerinaParser.NativeTypeConvertorContext ctx) { }
+	@Override public void enterNativeTypeMapper(BallerinaParser.NativeTypeMapperContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitNativeTypeConvertor(BallerinaParser.NativeTypeConvertorContext ctx) { }
+	@Override public void exitNativeTypeMapper(BallerinaParser.NativeTypeMapperContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterTypeConvertor(BallerinaParser.TypeConvertorContext ctx) { }
+	@Override public void enterTypeMapper(BallerinaParser.TypeMapperContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitTypeConvertor(BallerinaParser.TypeConvertorContext ctx) { }
+	@Override public void exitTypeMapper(BallerinaParser.TypeMapperContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterTypeConvertorInput(BallerinaParser.TypeConvertorInputContext ctx) { }
+	@Override public void enterTypeMapperInput(BallerinaParser.TypeMapperInputContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitTypeConvertorInput(BallerinaParser.TypeConvertorInputContext ctx) { }
+	@Override public void exitTypeMapperInput(BallerinaParser.TypeMapperInputContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterTypeConvertorBody(BallerinaParser.TypeConvertorBodyContext ctx) { }
+	@Override public void enterTypeMapperBody(BallerinaParser.TypeMapperBodyContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitTypeConvertorBody(BallerinaParser.TypeConvertorBodyContext ctx) { }
+	@Override public void exitTypeMapperBody(BallerinaParser.TypeMapperBodyContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -388,13 +388,13 @@ public class BallerinaBaseListener implements BallerinaListener {
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterTypeConvertorType(BallerinaParser.TypeConvertorTypeContext ctx) { }
+	@Override public void enterTypeMapperType(BallerinaParser.TypeMapperTypeContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitTypeConvertorType(BallerinaParser.TypeConvertorTypeContext ctx) { }
+	@Override public void exitTypeMapperType(BallerinaParser.TypeMapperTypeContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *

gen/org/ballerinalang/plugins/idea/grammar/BallerinaBaseVisitor.java

@@ -150,35 +150,35 @@ public class BallerinaBaseVisitor<T> extends AbstractParseTreeVisitor<T> impleme
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitTypeConvertorDefinition(BallerinaParser.TypeConvertorDefinitionContext ctx) { return visitChildren(ctx); }
+	@Override public T visitTypeMapperDefinition(BallerinaParser.TypeMapperDefinitionContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitNativeTypeConvertor(BallerinaParser.NativeTypeConvertorContext ctx) { return visitChildren(ctx); }
+	@Override public T visitNativeTypeMapper(BallerinaParser.NativeTypeMapperContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitTypeConvertor(BallerinaParser.TypeConvertorContext ctx) { return visitChildren(ctx); }
+	@Override public T visitTypeMapper(BallerinaParser.TypeMapperContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitTypeConvertorInput(BallerinaParser.TypeConvertorInputContext ctx) { return visitChildren(ctx); }
+	@Override public T visitTypeMapperInput(BallerinaParser.TypeMapperInputContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitTypeConvertorBody(BallerinaParser.TypeConvertorBodyContext ctx) { return visitChildren(ctx); }
+	@Override public T visitTypeMapperBody(BallerinaParser.TypeMapperBodyContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -234,7 +234,7 @@ public class BallerinaBaseVisitor<T> extends AbstractParseTreeVisitor<T> impleme
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitTypeConvertorType(BallerinaParser.TypeConvertorTypeContext ctx) { return visitChildren(ctx); }
+	@Override public T visitTypeMapperType(BallerinaParser.TypeMapperTypeContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *