Merge branch 'develop'

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

Author: halirutan

.idea/dictionaries/patrick.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/resources/META-INF/plugin.xml" manifest="file://$MODULE_DIR$/resources/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />

.idea/inspectionProfiles/Project_Default.xml

@@ -11,7 +11,7 @@ For a very quick start just download and install the free [Community Edition of
  (note that you don't have to provide a username. Just leave the field blank).
 ##![Docs][doc-image]Documentation
 
-There are two kinds of documentation: For **users** there is the [documentation page](http://wlplugin.halirutan.de/index.php/documentation) and a very detailed [blog post](http://wlplugin.halirutan.de/index.php/blog/7-how-to-use-idea-effectively-with-mathematica-code) on the official website. There, you will learn what features the plug-in provides and how you can use them.
+There are two kinds of documentation: For **users** there is the [GitHub Wiki page](https://github.com/halirutan/Mathematica-IntelliJ-Plugin/wiki) that I will update regularely and a very detailed [blog post](http://wlplugin.halirutan.de/index.php/blog/7-how-to-use-idea-effectively-with-mathematica-code) on the official website. There, you will learn what features the plug-in provides and how you can use them.
 
 For **developers**, the first action is to set up the build-environment to compile the code into an IDEA plug-in. There is a [very detailed how-to](http://wlplugin.halirutan.de/index.php/blog/5-plugin-development-how-to-start) on the official website that explains every step. Additionally, you will find a screen-cast there, where the procedure is shown step by step. The code itself contains java-documentation that is uploaded to [the repository's IO page](http://halirutan.github.io/Mathematica-IntelliJ-Plugin/).
 
@@ -21,7 +21,7 @@ Finally, there I have posted information on [stack exchange](http://mathematica.
 - the [first announcement](http://community.wolfram.com/groups/-/m/t/139047?p_p_auth=Lp2pA68y) on the Wolfram Community and a very detailed [new version post](http://community.wolfram.com/groups/-/m/t/353812?p_p_auth=Lp2pA68y)
 
 
-##![dev image][dev-image] Development  ![travis](https://travis-ci.org/halirutan/Mathematica-IntelliJ-Plugin.svg?branch=develop)
+##![dev image][dev-image] Development  [![Build Status](https://travis-ci.org/halirutan/Mathematica-IntelliJ-Plugin.svg?branch=develop)](https://travis-ci.org/halirutan/Mathematica-IntelliJ-Plugin)
 
 ### Code
 

.idea/runConfigurations/Mathematica_Plugin.xml

@@ -27,15 +27,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.jetbrains.plugins</groupId>
     <artifactId>mathematica-intellij-plugin</artifactId>
-    <version>1.3.5</version>
+    <version>2.0.10</version>
     <name>Mathematica Support for IntelliJ IDEA</name>
     <description>Includes syntax highlighting, function completion, documentation lookup, refactoring, code formatting,
         etc.
     </description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <idea.ic.source>ideaIC-2016.2.5.tar.gz</idea.ic.source>
+        <idea.ic.source>ideaIC-2016.3.tar.gz</idea.ic.source>
         <idea.ic.dir>${project.build.directory}/idea-IC</idea.ic.dir>
         <ij.plugin>true</ij.plugin>
     </properties>

Mathematica-IntelliJ-Plugin.iml

@@ -1,9 +1,30 @@
+<!--
+  ~ Copyright (c) 2017 Patrick Scheibe
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in
+  ~ all copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  ~ THE SOFTWARE.
+  -->
+
 <idea-plugin url="http://mathematicaplugin.halirutan.de" version="2">
   <id>de.halirutan.mathematica</id>
   <name>Mathematica Support</name>
   <category>Custom Language</category>
-  <version>2.0.2</version>
-  <idea-version since-build="135.1230"/>
+  <version>2.0.20</version>
+  <idea-version since-build="163"/>
   <vendor email="patrick@halirutan.de" url="http://mathematicaplugin.halirutan.de">Patrick Scheibe</vendor>
   <depends>com.intellij.modules.lang</depends>
   <description><![CDATA[
@@ -17,7 +38,8 @@
     <br/>
 
     This plugin turns your IntelliJ IDEA into a powerful coding environment for Mathematica. For more information
-    check out the <a href="http://mathematicaplugin.halirutan.de">official website</a>.
+    check out the <a href="http://mathematicaplugin.halirutan.de">official website</a>. I have started to create user-friendly
+    documentation of various features on the <a href="https://github.com/halirutan/Mathematica-IntelliJ-Plugin/wiki">Wiki pages of GitHub</a>.
     If you want to discuss specific topics, then ping me
     (<a href="http://mathematica.stackexchange.com/users/187/halirutan?tab=profile">halirutan</a>) in the dedicated
     <a href="http://chat.stackexchange.com/rooms/8636/intellijidea-plugin-for-mathematica">chat room on stackexchange</a>.
@@ -33,33 +55,25 @@
       <li>Quick documentation lookup for all built-in symbols and operators</li>
       <li>Structured View for package definitions</li>
       <li>Correct display of Mathematica's <a href="https://reference.wolfram.com/language/guide/ListingOfNamedCharacters.html">named characters</a>
-      <li>Inspection of missing commas and semicolons
+      <li>Inspections for version mismatch of symbols, possible errors through multiplicaton at linebreak, and missing commas and semicolons
       <li>Autocompletion suggestions sorted by importance</li>
       <li>Highlighting and smart inserting of braces, brackets and parenthesis</li>
+      <li>Quick navigation between symbol usages with Navigate - Related Symbol</li>
     </ul>
       ]]></description>
 
   <change-notes>
     <![CDATA[
-      <i>New features and bugfixes:</i>
+      <i>New features and bug-fixes:</i>
       <br/>
       <ul>
+        <li>Improvement of syntax highlighting for full names of symbols inside scoping constructs (<a href="https://github.com/halirutan/Mathematica-IntelliJ-Plugin/issues/52">GH-52</a>)</li>
+        <li>Recognize function names in usage messages (<a href="https://github.com/halirutan/Mathematica-IntelliJ-Plugin/issues/58">GH-58</a>)</li>
+        <li>Improved highlighting settings colors (<a href="https://github.com/halirutan/Mathematica-IntelliJ-Plugin/issues/47">GH-47</a>)</li>
         <li>Fixed smart-completion of Options that stopped working (<a href="https://github.com/halirutan/Mathematica-IntelliJ-Plugin/issues/30">GH-30</a>)</li>
         <li>Fixed some localization constructs and added unicode of the Eth symbol (<a href="https://github.com/halirutan/Mathematica-IntelliJ-Plugin/issues/26">GH-26</a> and <a href="https://github.com/halirutan/Mathematica-IntelliJ-Plugin/issues/27">GH-27</a>)</li>
         <li>Made indentation for Association brackets like the indentation for lists <a href="https://github.com/halirutan/Mathematica-IntelliJ-Plugin/issues/20">(GH-20)</a></li>
         <li>Fixed the renaming engine so that renamed variables can now have context back-ticks</li>
-        <li>Fixed bug where an inspection used much CPU <a href="https://github.com/halirutan/Mathematica-IntelliJ-Plugin/issues/19">(GH-19)</a></li>
-        <li>Included <-> as operator <a href="https://github.com/halirutan/Mathematica-IntelliJ-Plugin/issues/17">(GH-17)</a></li>
-        <li>Fixed null pointer exception. <a href="http://halirutan.myjetbrains.com/youtrack/issue/MMAP-75">(MMAP-75)</a></li>
-        <li>Fixed exception when you press Enter near the end of a file and you have folded many regions.</li>
-        <li>Fixed issue that introduced an empty line when Enter is pressed in a function call</li>
-        <li>Implemented a feature for expand/shrink selection so that all arguments of a function or list can be selected without the braces</li>
-        <li>Completely re-implemented the behavior of the Enter key. This should now insert correct indents on the next line, when Enter is pressed</li>
-        <li>Implemented code folding for Module, Block, With <a href="http://halirutan.myjetbrains.com/youtrack/issue/MMAP-69">(MMAP-69)</a></li>
-        <li>Implemented correct display for named characters like <code>\[Gamma]</code></li>
-        <li>Improved "Fix all missing semicolon feature" to work correctly on large files <a href="http://halirutan.myjetbrains.com/youtrack/issue/MMAP-68">(MMAP-68)</a></li>
-        <li>Added Live Template for creating options (opt) <a href="http://halirutan.myjetbrains.com/youtrack/issue/MMAP-71">(MMAP-71)</a></li>
-        <li>Small improvements in the file templates</li>
       </ul>
     ]]>
   </change-notes>
@@ -74,15 +88,13 @@
                            implementationClass="de.halirutan.mathematica.parsing.prattparser.MathematicaParserDefinition"/>
 
     <sdkType id="Mathematica Sdk" implementation="de.halirutan.mathematica.sdk.MathematicaSdkType"/>
-
     <moduleType id="MATHEMATICA_MODULE"
                 implementationClass="de.halirutan.mathematica.module.MathematicaModuleType"/>
     <moduleConfigurationEditorProvider
             implementation="de.halirutan.mathematica.module.MathematicaModuleConfigurationEditor"/>
 
     <projectTemplatesFactory implementation="de.halirutan.mathematica.module.MathematicaProjectTemplatesFactory"/>
 
-
     <!-- Highlighting and annotating of code, StructureView and documentation lookup-->
 
     <lang.syntaxHighlighterFactory language="Mathematica"
@@ -166,6 +178,18 @@
     <inspectionToolProvider
         implementation="de.halirutan.mathematica.codeinsight.inspections.MathematicaInspectionProvider"/>
 
+    <psi.referenceContributor language="Mathematica" implementation="de.halirutan.mathematica.parsing.psi.MathematicaReferenceContributor"/>
+    <renamePsiElementProcessor implementation="de.halirutan.mathematica.refactoring.MathematicaPsiRenameProcessor"/>
+
+    <applicationService serviceInterface="de.halirutan.mathematica.settings.MathematicaSettings" serviceImplementation="de.halirutan.mathematica.settings.MathematicaSettings"/>
+    <applicationConfigurable groupId="language" displayName="Mathematica" id="preferences.Mathematica"
+                             instance="de.halirutan.mathematica.settings.MathematicaSettingsConfigurable"/>
+    <gotoRelatedProvider
+        implementation="de.halirutan.mathematica.codeinsight.navigation.MathematicaGotoRelatedProvider"/>
+
+    <intentionAction>
+      <className>de.halirutan.mathematica.intentions.localization.MoveVariableToLocalisation</className>
+    </intentionAction>
   </extensions>
 
   <actions>
@@ -201,6 +225,8 @@
               description="Collapse all named characters into their utf8 counterpart.">
       </action>
 
+      <!--<action id="Mathematica.RenameReferenceResolve" class="de.halirutan.mathematica.actions.RenameReferenceResolve"-->
+              <!--text="Rename Reference Resolve"/>-->
       <!--<separator/>-->
 
       <!--<action id="Mathematica.ShowFormattingBlocks" class="de.halirutan.mathematica.actions.ShowFormattingBlocks"-->
@@ -210,5 +236,6 @@
 
       <add-to-group group-id="MainMenu" anchor="after" relative-to-action="ToolsMenu"/>
     </group>
+
   </actions>
 </idea-plugin>

README.md

@@ -51,7 +51,7 @@
     </value>
   </option>
 
-  <option name="MMA.OPERATOR">
+  <option name="MMA.OPERATORS">
     <value>
       <option name="FOREGROUND" value="C9D7E6"/>
     </value>
@@ -107,8 +107,8 @@
   <option name="MMA.USAGE_MESSAGE">
     <value>
       <option name="FOREGROUND" value="CC7832"/>
-      <option name="EFFECT_COLOR" value="CC7832"/>
-      <option name="EFFECT_TYPE" value="1"/>
+      <option name="FONT_TYPE" value="1"/>
+
     </value>
   </option>
 

design/iconSources/IconsForVersion2.ai

@@ -51,7 +51,7 @@
     </value>
   </option>
 
-  <option name="MMA.OPERATOR">
+  <option name="MMA.OPERATORS">
     <value>
       <option name="FOREGROUND" value="000000"/>
     </value>