MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 13:31:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

Migrate python intelliLang to v2

Browse Source 
GitOrigin-RevId: ffcac639cf73ac332731101939b5bdc906f47372
This commit is contained in:
Ilya.Kazakevich
2023-12-21 20:58:47 +01:00
committed by intellij-monorepo-bot
parent 5903ec85c4
commit 19ed89fec2
8 changed files with 24 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
python/IntelliLang-python/resources/META-INF/intellilang-python-support.xml
View File

@@ -1,11 +0,0 @@
<idea-plugin>
<extensions defaultExtensionNs="org.intellij.intelliLang">
<languageSupport implementation="com.jetbrains.python.intelliLang.PyLanguageInjectionSupport"/>
<injectionConfig config="resources/pyInjections.xml"/>
</extensions>
<extensions defaultExtensionNs="com.intellij">
<patterns.patternClass className="com.jetbrains.python.patterns.PythonPatterns" alias="py"/>
<multiHostInjector implementation="com.jetbrains.python.intelliLang.PyConfigurationInjector"/>
<multiHostInjector implementation="com.jetbrains.python.intelliLang.PyTemporaryInjector"/>
</extensions>
</idea-plugin>

14
python/IntelliLang-python/resources/intellij.python.langInjection.xml Normal file
View File

@@ -0,0 +1,14 @@
<idea-plugin package="com.intellij.python.langInjection">
<dependencies>
<plugin id="org.intellij.intelliLang"/>
</dependencies>
<extensions defaultExtensionNs="org.intellij.intelliLang">
<languageSupport implementation="com.intellij.python.langInjection.PyLanguageInjectionSupport"/>
<injectionConfig config="resources/pyInjections.xml"/>
</extensions>
<extensions defaultExtensionNs="com.intellij">
<patterns.patternClass className="com.jetbrains.python.patterns.PythonPatterns" alias="py"/>
<multiHostInjector implementation="com.intellij.python.langInjection.PyConfigurationInjector"/>
<multiHostInjector implementation="com.intellij.python.langInjection.PyTemporaryInjector"/>
</extensions>
</idea-plugin>

18
python/IntelliLang-python/src/com/jetbrains/python/intelliLang/PyCommentInjector.java → python/IntelliLang-python/src/com/intellij/python/langInjection/PyCommentInjector.java
View File

@@ -1,19 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jetbrains.python.intelliLang;
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.python.langInjection;
import com.intellij.lang.Language;
import com.intellij.psi.PsiElement;

18
python/IntelliLang-python/src/com/jetbrains/python/intelliLang/PyConfigurationInjector.java → python/IntelliLang-python/src/com/intellij/python/langInjection/PyConfigurationInjector.java
View File

@@ -1,19 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jetbrains.python.intelliLang;
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.python.langInjection;
import com.intellij.lang.Language;
import com.intellij.lang.injection.MultiHostRegistrar;

4
python/IntelliLang-python/src/com/jetbrains/python/intelliLang/PyLanguageInjectionSupport.java → python/IntelliLang-python/src/com/intellij/python/langInjection/PyLanguageInjectionSupport.java
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.jetbrains.python.intelliLang;
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.python.langInjection;
import com.intellij.psi.PsiLanguageInjectionHost;
import com.jetbrains.python.patterns.PythonPatterns;

18
python/IntelliLang-python/src/com/jetbrains/python/intelliLang/PyTemporaryInjector.java → python/IntelliLang-python/src/com/intellij/python/langInjection/PyTemporaryInjector.java
View File

@@ -1,19 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jetbrains.python.intelliLang;
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.python.langInjection;
import com.intellij.lang.Language;
import com.intellij.lang.injection.MultiHostRegistrar;

2
python/pluginCore/resources/META-INF/plugin.xml
View File

@@ -28,12 +28,12 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
<depends optional="true" config-file="python-plugin-rustrover.xml">com.intellij.modules.rustrover</depends>
<depends optional="true" config-file="python-rest-plugin.xml">org.jetbrains.plugins.rest</depends>
<depends optional="true" config-file="python-copyright-plugin.xml">com.intellij.copyright</depends>
<depends optional="true" config-file="intellilang-python-support.xml">org.intellij.intelliLang</depends>
<content>
<module name="intellij.python.terminal"/>
<module name="intellij.python.featuresTrainer"/>
<module name="intellij.python.markdown"/>
<module name="intellij.python.grazie"/>
<module name="intellij.python.langInjection"/>
</content>
<extensions defaultExtensionNs="com.intellij">

2
python/testSrc/META-INF/PyCharmCorePlugin.xml
View File

@@ -3,7 +3,6 @@
<xi:include href="/META-INF/PlatformLangXmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/META-INF/python-core-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="python-copyright-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="intellilang-python-support.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="python-rest-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
<extensions defaultExtensionNs="com.intellij">
<applicationService serviceInterface="com.jetbrains.python.console.PythonConsoleRunnerFactory"
@@ -12,5 +11,6 @@
<content>
<module name="intellij.python.markdown"/>
<module name="intellij.python.grazie"/>
<module name="intellij.python.langInjection"/>
</content>
</idea-plugin>