Merge remote-tracking branch 'origin/master'

python/helpers/generator3.py

@@ -2208,7 +2208,7 @@ def buildOutputName(subdir, name):
     global action
     quals = name.split(".")
     dirname = subdir
-    if dirname and not dirname.endswith(os.path.sep):
+    if dirname and not dirname.endswith("/") and not dirname.endswith("\\") :
         dirname += os.path.sep # "a -> a/"
     for pathindex in range(len(quals) - 1): # create dirs for all quals but last
         subdirname = dirname + os.path.sep.join(quals[0: pathindex + 1])

python/rest/resources/META-INF/rest.xml

@@ -7,8 +7,6 @@
     <lang.parserDefinition language="ReST" implementationClass="com.jetbrains.rest.parsing.RestParserDefinition"/>
     <colorSettingsPage implementation="com.jetbrains.rest.RestColorsPage"/>
 
-    <projectService serviceInterface="com.jetbrains.python.ReSTService"
-                    serviceImplementation="com.jetbrains.python.ReSTService"/>
     <completion.contributor language="ReST" implementationClass="com.jetbrains.rest.completion.DirectiveCompletionContributor"/>
     <completion.contributor language="ReST" implementationClass="com.jetbrains.rest.completion.OptionCompletionContributor"/>
     <completion.contributor language="ReST" implementationClass="com.jetbrains.rest.completion.ReferenceCompletionContributor"/>

python/src/META-INF/python-plugin-common.xml

@@ -91,6 +91,9 @@
 
     <targetElementEvaluator language="Python" implementationClass="com.jetbrains.python.codeInsight.PyTargetElementEvaluator"/>
 
+    <projectService serviceInterface="com.jetbrains.python.ReSTService"
+                    serviceImplementation="com.jetbrains.python.ReSTService"/>
+
     <!-- Run/Debug -->
     <applicationService serviceInterface="com.jetbrains.python.run.PyRunConfigurationFactory"
                         serviceImplementation="com.jetbrains.python.run.PyRunConfigurationFactoryImpl"/>