mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-04-18 04:21:24 +07:00
PY-81471 Move PythonColorsPage to python.syntax
GitOrigin-RevId: 402caeea59f52bde6cb93c6c9964efc770516bd9
This commit is contained in:
Petr
committed by
intellij-monorepo-bot
intellij-monorepo-bot
parent
a15959a1e3
commit
748017efe4
@@ -25,6 +25,7 @@ jvm_library(
|
||||
"//platform/core-ui",
|
||||
"//platform/code-style-impl:codeStyle-impl",
|
||||
"@lib//:fastutil-min",
|
||||
"@lib//:guava",
|
||||
],
|
||||
runtime_deps = [":syntax_resources"]
|
||||
)
|
||||
|
||||
@@ -20,5 +20,6 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.core.ui" />
|
||||
<orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
|
||||
<orderEntry type="library" name="fastutil-min" level="project" />
|
||||
<orderEntry type="library" name="Guava" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -20,6 +20,7 @@
|
||||
<typedHandler implementation="com.jetbrains.python.editor.PythonSpaceHandler"/>
|
||||
<backspaceHandlerDelegate implementation="com.jetbrains.python.codeInsight.editorActions.PyTripleQuoteBackspaceDelegate"/>
|
||||
<annotator language="Python" implementationClass="com.jetbrains.python.validation.PyCompositeAnnotator"/>
|
||||
<colorSettingsPage implementation="com.jetbrains.python.highlighting.PythonColorsPage"/>
|
||||
</extensions>
|
||||
<extensions defaultExtensionNs="Pythonid">
|
||||
<pyAnnotator implementation="com.jetbrains.python.validation.PyHighlightingAnnotator"/>
|
||||
|
||||
@@ -50,3 +50,38 @@ configurable.PyLanguageCodeStyleSettingsProvider.display.name=Python
|
||||
|
||||
formatter.force.trailing.comma.if.multiline=Force trailing comma if multiline
|
||||
|
||||
python.colors.python=Python
|
||||
python.colors.type.annotation=Type annotation
|
||||
python.colors.class.definition=Class definition
|
||||
python.colors.decorator=Decorator
|
||||
python.colors.built.in.name=Built-in name
|
||||
python.colors.special.names.usage=Special names//Usage
|
||||
python.colors.special.names.definition=Special names//Definition
|
||||
python.colors.keyword.argument=Keyword argument
|
||||
python.colors.parameters.self.parameter=Parameters//'self' parameter
|
||||
python.colors.parameters.parameter=Parameters//Parameter
|
||||
python.colors.functions.method.call=Functions//Method call
|
||||
python.colors.functions.nested.function.definition=Functions//Nested function definition
|
||||
python.colors.functions.function.call=Functions//Function call
|
||||
python.colors.functions.function.definition=Functions//Function definition
|
||||
python.colors.braces.and.operators.dot=Braces and Operators//Dot
|
||||
python.colors.braces.and.operators.comma=Braces and Operators//Comma
|
||||
python.colors.braces.and.operators.braces=Braces and Operators//Braces
|
||||
python.colors.braces.and.operators.brackets=Braces and Operators//Brackets
|
||||
python.colors.braces.and.operators.parentheses=Braces and Operators//Parentheses
|
||||
python.colors.braces.and.operators.operation.sign=Braces and Operators//Operation sign
|
||||
python.colors.docstring.tag=Docstring//Tag
|
||||
python.colors.docstring.text=Docstring//Text
|
||||
python.colors.string.f.string.format.specifier.start=String//f-string//Format specifier start
|
||||
python.colors.string.f.string.type.conversion=String//f-string//Type conversion
|
||||
python.colors.string.f.string.expression.braces=String//f-string//Expression braces
|
||||
python.colors.string.escape.sequence.invalid=String//Escape sequence//Invalid
|
||||
python.colors.string.escape.sequence.valid=String//Escape sequence//Valid
|
||||
python.colors.string.text.unicode=String//Text (unicode)
|
||||
python.colors.string.binary.bytes=String//Binary (bytes)
|
||||
python.colors.line.comment=Line comment
|
||||
python.colors.keyword=Keyword
|
||||
python.colors.number=Number
|
||||
python.colors.local.variables=Local variables
|
||||
python.colors.type.parameters=Type parameters
|
||||
|
||||
|
||||
@@ -0,0 +1,179 @@
|
||||
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.jetbrains.python.highlighting;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.intellij.application.options.colors.InspectionColorSettingsPage;
|
||||
import com.intellij.codeHighlighting.RainbowHighlighter;
|
||||
import com.intellij.lang.Language;
|
||||
import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
|
||||
import com.intellij.openapi.editor.colors.TextAttributesKey;
|
||||
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
|
||||
import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
|
||||
import com.intellij.openapi.options.colors.AttributesDescriptor;
|
||||
import com.intellij.openapi.options.colors.ColorDescriptor;
|
||||
import com.intellij.openapi.options.colors.RainbowColorSettingsPage;
|
||||
import com.intellij.psi.codeStyle.DisplayPriority;
|
||||
import com.intellij.psi.codeStyle.DisplayPrioritySortable;
|
||||
import com.intellij.util.PlatformUtils;
|
||||
import com.jetbrains.python.PySyntaxBundle;
|
||||
import com.jetbrains.python.PythonFileType;
|
||||
import com.jetbrains.python.PythonLanguage;
|
||||
import com.jetbrains.python.psi.LanguageLevel;
|
||||
import org.jetbrains.annotations.NonNls;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
public class PythonColorsPage implements RainbowColorSettingsPage, InspectionColorSettingsPage, DisplayPrioritySortable {
|
||||
private static final AttributesDescriptor[] ATTRS = new AttributesDescriptor[] {
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.number"), PyHighlighter.PY_NUMBER),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.keyword"), PyHighlighter.PY_KEYWORD),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.line.comment"), PyHighlighter.PY_LINE_COMMENT),
|
||||
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.string.binary.bytes"), PyHighlighter.PY_BYTE_STRING),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.string.text.unicode"), PyHighlighter.PY_UNICODE_STRING),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.string.escape.sequence.valid"), PyHighlighter.PY_VALID_STRING_ESCAPE),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.string.escape.sequence.invalid"), PyHighlighter.PY_INVALID_STRING_ESCAPE),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.string.f.string.expression.braces"), PyHighlighter.PY_FSTRING_FRAGMENT_BRACES),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.string.f.string.type.conversion"), PyHighlighter.PY_FSTRING_FRAGMENT_TYPE_CONVERSION),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.string.f.string.format.specifier.start"), PyHighlighter.PY_FSTRING_FRAGMENT_COLON),
|
||||
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.docstring.text"), PyHighlighter.PY_DOC_COMMENT),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.docstring.tag"), PyHighlighter.PY_DOC_COMMENT_TAG),
|
||||
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.braces.and.operators.operation.sign"), PyHighlighter.PY_OPERATION_SIGN),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.braces.and.operators.parentheses"), PyHighlighter.PY_PARENTHS),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.braces.and.operators.brackets"), PyHighlighter.PY_BRACKETS),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.braces.and.operators.braces"), PyHighlighter.PY_BRACES),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.braces.and.operators.comma"), PyHighlighter.PY_COMMA),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.braces.and.operators.dot"), PyHighlighter.PY_DOT),
|
||||
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.functions.function.definition"), PyHighlighter.PY_FUNC_DEFINITION),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.functions.nested.function.definition"), PyHighlighter.PY_NESTED_FUNC_DEFINITION),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.functions.function.call"), PyHighlighter.PY_FUNCTION_CALL),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.functions.method.call"), PyHighlighter.PY_METHOD_CALL),
|
||||
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.parameters.parameter"), PyHighlighter.PY_PARAMETER),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.parameters.self.parameter"), PyHighlighter.PY_SELF_PARAMETER),
|
||||
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.keyword.argument"), PyHighlighter.PY_KEYWORD_ARGUMENT),
|
||||
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.special.names.definition"), PyHighlighter.PY_PREDEFINED_DEFINITION),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.special.names.usage"), PyHighlighter.PY_PREDEFINED_USAGE),
|
||||
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.built.in.name"), PyHighlighter.PY_BUILTIN_NAME),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.decorator"), PyHighlighter.PY_DECORATOR),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.class.definition"), PyHighlighter.PY_CLASS_DEFINITION),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.type.annotation"), PyHighlighter.PY_ANNOTATION),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.local.variables"), PyHighlighter.PY_LOCAL_VARIABLE),
|
||||
new AttributesDescriptor(PySyntaxBundle.messagePointer("python.colors.type.parameters"), PyHighlighter.PY_TYPE_PARAMETER),
|
||||
};
|
||||
|
||||
private static final @NonNls Map<String,TextAttributesKey> ourTagToDescriptorMap = ImmutableMap.<String, TextAttributesKey>builder()
|
||||
.put("docComment", PyHighlighter.PY_DOC_COMMENT)
|
||||
.put("docCommentTag", PyHighlighter.PY_DOC_COMMENT_TAG)
|
||||
.put("decorator", PyHighlighter.PY_DECORATOR)
|
||||
.put("predefined", PyHighlighter.PY_PREDEFINED_DEFINITION)
|
||||
.put("predefinedUsage", PyHighlighter.PY_PREDEFINED_USAGE)
|
||||
.put("funcDef", PyHighlighter.PY_FUNC_DEFINITION)
|
||||
.put("nestedFuncDef", PyHighlighter.PY_NESTED_FUNC_DEFINITION)
|
||||
.put("classDef", PyHighlighter.PY_CLASS_DEFINITION)
|
||||
.put("builtin", PyHighlighter.PY_BUILTIN_NAME)
|
||||
.put("self", PyHighlighter.PY_SELF_PARAMETER)
|
||||
.put("param", PyHighlighter.PY_PARAMETER)
|
||||
.put("kwarg", PyHighlighter.PY_KEYWORD_ARGUMENT)
|
||||
.put("call", PyHighlighter.PY_FUNCTION_CALL)
|
||||
.put("mcall", PyHighlighter.PY_METHOD_CALL)
|
||||
.put("annotation", PyHighlighter.PY_ANNOTATION)
|
||||
.put("localVar", PyHighlighter.PY_LOCAL_VARIABLE)
|
||||
.put("typeParam", PyHighlighter.PY_TYPE_PARAMETER)
|
||||
.putAll(RainbowHighlighter.createRainbowHLM())
|
||||
.build();
|
||||
|
||||
@Override
|
||||
public @NotNull String getDisplayName() {
|
||||
return PySyntaxBundle.message("python.colors.python");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Icon getIcon() {
|
||||
return PythonFileType.INSTANCE.getIcon();
|
||||
}
|
||||
|
||||
@Override
|
||||
public AttributesDescriptor @NotNull [] getAttributeDescriptors() {
|
||||
return ATTRS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ColorDescriptor @NotNull [] getColorDescriptors() {
|
||||
return ColorDescriptor.EMPTY_ARRAY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull SyntaxHighlighter getHighlighter() {
|
||||
final SyntaxHighlighterFactory factory = SyntaxHighlighterFactory.getLanguageFactory().forLanguage(PythonLanguage.getInstance());
|
||||
if (factory instanceof PySyntaxHighlighterFactoryBase) {
|
||||
return ((PySyntaxHighlighterFactoryBase)factory).getSyntaxHighlighterForLanguageLevel(LanguageLevel.getLatest());
|
||||
}
|
||||
return factory.getSyntaxHighlighter(null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull String getDemoText() {
|
||||
return
|
||||
"@<decorator>decorator</decorator>(<kwarg>param</kwarg>=1)\n" +
|
||||
"def f(<param>x</param>):\n" +
|
||||
" <docComment>\"\"\"\n" +
|
||||
" Syntax Highlighting Demo\n" +
|
||||
" <docCommentTag>@param</docCommentTag> x Parameter\n" +
|
||||
RainbowHighlighter.generatePaletteExample("\n ") + "\n" +
|
||||
" \"\"\"</docComment>\n" +
|
||||
"\n" +
|
||||
" def <nestedFuncDef>nested_func</nestedFuncDef>(<param>y</param>):\n" +
|
||||
" <call>print</call>(<param>y</param> + 1)\n" +
|
||||
"\n" +
|
||||
" <localVar>s</localVar> = (\"Test\", 2+3, {'a': 'b'}, f'{<param>x</param>!s:{\"^10\"}}') # Comment\n" +
|
||||
" <call>f</call>(<localVar>s</localVar>[0].<mcall>lower</mcall>())\n" +
|
||||
" <call>nested_func</call>(42)\n" +
|
||||
"\n" +
|
||||
"class <classDef>Foo</classDef>:\n" +
|
||||
" tags: <annotation>List[<builtin>str</builtin>]</annotation>\n" +
|
||||
"\n" +
|
||||
" def <predefined>__init__</predefined>(<self>self</self>: <annotation>Foo</annotation>):\n" +
|
||||
" <localVar>byte_string</localVar>: <annotation><builtin>bytes</builtin></annotation> = b'newline:\\n also newline:\\x0a'\n" +
|
||||
" <localVar>text_string</localVar> = u\"Cyrillic Я is \\u042f. Oops: \\u042g\"\n" +
|
||||
" <self>self</self>.<mcall>make_sense</mcall>(<kwarg>whatever</kwarg>=1)\n" +
|
||||
" \n" +
|
||||
" def <funcDef>make_sense[<typeParam>T</typeParam>]</funcDef>(<self>self</self>, <param>whatever:</param> <annotation>T</annotation>):\n" +
|
||||
" <self>self</self>.sense = <param>whatever</param>\n" +
|
||||
"\n" +
|
||||
"x = <builtin>len</builtin>('abc')\n" +
|
||||
"type my_int< = <builtin>int</builtin>\n" +
|
||||
"print(f.<predefinedUsage>__doc__</predefinedUsage>)"
|
||||
;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, TextAttributesKey> getAdditionalHighlightingTagToDescriptorMap() {
|
||||
return ourTagToDescriptorMap;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DisplayPriority getPriority() {
|
||||
return PlatformUtils.isPyCharm() ? DisplayPriority.KEY_LANGUAGE_SETTINGS : DisplayPriority.LANGUAGE_SETTINGS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isRainbowType(TextAttributesKey type) {
|
||||
return PyHighlighter.PY_PARAMETER.equals(type) || DefaultLanguageHighlighterColors.LOCAL_VARIABLE.equals(type);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable Language getLanguage() {
|
||||
return PythonLanguage.INSTANCE;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user