Skip to content

[morph.ai] Fixed PLAYGROUND-PR-3367 -- Improved detection of keywords following numbers in Python syntax highlighting #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: codemate_base_257cfee
Choose a base branch
from
Open

[morph.ai] Fixed PLAYGROUND-PR-3367 -- Improved detection of keywords following numbers in Python syntax highlighting #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions src/languages/python.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export default function(hljs) {
];

const KEYWORDS = {
$pattern: /[A-Za-z]\w+|__\w+__/,
$pattern: /[A-Za-z]\w+|__\w+__/,
keyword: RESERVED_WORDS,
built_in: BUILT_INS,
literal: LITERALS,
Expand All @@ -158,14 +158,14 @@ export default function(hljs) {

const SUBST = {
className: 'subst',
begin: /\{/,
begin: /\{/,
end: /\}/,
keywords: KEYWORDS,
illegal: /#/
illegal: /#/
};

const LITERAL_BRACKET = {
begin: /\{\{/,
begin: /\{\{/,
relevance: 0
};

Expand All @@ -174,7 +174,7 @@ export default function(hljs) {
contains: [ hljs.BACKSLASH_ESCAPE ],
variants: [
{
begin: /([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?'''/,
begin: /([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?'''/,
end: /'''/,
contains: [
hljs.BACKSLASH_ESCAPE,
Expand All @@ -183,7 +183,7 @@ export default function(hljs) {
relevance: 10
},
{
begin: /([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?"""/,
begin: /([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?"""/,
end: /"""/,
contains: [
hljs.BACKSLASH_ESCAPE,
Expand All @@ -192,7 +192,7 @@ export default function(hljs) {
relevance: 10
},
{
begin: /([fF][rR]|[rR][fF]|[fF])'''/,
begin: /([fF][rR]|[rR][fF]|[fF])'''/,
end: /'''/,
contains: [
hljs.BACKSLASH_ESCAPE,
Expand All @@ -202,7 +202,7 @@ export default function(hljs) {
]
},
{
begin: /([fF][rR]|[rR][fF]|[fF])"""/,
begin: /([fF][rR]|[rR][fF]|[fF])"""/,
end: /"""/,
contains: [
hljs.BACKSLASH_ESCAPE,
Expand All @@ -212,25 +212,25 @@ export default function(hljs) {
]
},
{
begin: /([uU]|[rR])'/,
begin: /([uU]|[rR])'/,
end: /'/,
relevance: 10
},
{
begin: /([uU]|[rR])"/,
begin: /([uU]|[rR])"/,
end: /"/,
relevance: 10
},
{
begin: /([bB]|[bB][rR]|[rR][bB])'/,
begin: /([bB]|[bB][rR]|[rR][bB])'/,
end: /'/
},
{
begin: /([bB]|[bB][rR]|[rR][bB])"/,
begin: /([bB]|[bB][rR]|[rR][bB])"/,
end: /"/
},
{
begin: /([fF][rR]|[rR][fF]|[fF])'/,
begin: /([fF][rR]|[rR][fF]|[fF])'/,
end: /'/,
contains: [
hljs.BACKSLASH_ESCAPE,
Expand All @@ -239,7 +239,7 @@ export default function(hljs) {
]
},
{
begin: /([fF][rR]|[rR][fF]|[fF])"/,
begin: /([fF][rR]|[rR][fF]|[fF])"/,
end: /"/,
contains: [
hljs.BACKSLASH_ESCAPE,
Expand All @@ -254,7 +254,7 @@ export default function(hljs) {

// https://docs.python.org/3.9/reference/lexical_analysis.html#numeric-literals
const digitpart = '[0-9](_?[0-9])*';
const pointfloat = `(\\b(${digitpart}))?\\.(${digitpart})|\\b(${digitpart})\\.`;
const pointfloat = `(\b(${digitpart}))?\.(${digitpart})|\b(${digitpart})\.`;
const NUMBER = {
className: 'number',
relevance: 0,
Expand All @@ -270,10 +270,10 @@ export default function(hljs) {
// because both MUST contain a decimal point and so cannot be confused with
// the interior part of an identifier
{
begin: `(\\b(${digitpart})|(${pointfloat}))[eE][+-]?(${digitpart})[jJ]?\\b`
begin: `(\b(${digitpart})|(${pointfloat}))[eE][+-]?(${digitpart})[jJ]?\b`
},
{
begin: `(${pointfloat})[jJ]?`
begin: `(${pointfloat})(\b|(?=[^.]))[jJ]?`
},

// decinteger, bininteger, octinteger, hexinteger
Expand All @@ -283,22 +283,22 @@ export default function(hljs) {
// decinteger is optionally imaginary
// https://docs.python.org/3.9/reference/lexical_analysis.html#imaginary-literals
{
begin: '\\b([1-9](_?[0-9])*|0+(_?0)*)[lLjJ]?\\b'
begin: '\b([1-9](_?[0-9])*|0+(_?0)*)[lLjJ]?\b'
},
{
begin: '\\b0[bB](_?[01])+[lL]?\\b'
begin: '\b0[bB](_?[01])+[lL]?\b'
},
{
begin: '\\b0[oO](_?[0-7])+[lL]?\\b'
begin: '\b0[oO](_?[0-7])+[lL]?\b'
},
{
begin: '\\b0[xX](_?[0-9a-fA-F])+[lL]?\\b'
begin: '\b0[xX](_?[0-9a-fA-F])+[lL]?\b'
},

// imagnumber (digitpart-based)
// https://docs.python.org/3.9/reference/lexical_analysis.html#imaginary-literals
{
begin: `\\b(${digitpart})[jJ]\\b`
begin: `\b(${digitpart})[jJ]\b`
}
]
};
Expand Down Expand Up @@ -378,7 +378,7 @@ export default function(hljs) {
hljs.HASH_COMMENT_MODE,
{
match: [
/def/, /\s+/,
/def/, /\s+/,
IDENT_RE,
],
scope: {
Expand All @@ -391,14 +391,14 @@ export default function(hljs) {
variants: [
{
match: [
/class/, /\s+/,
IDENT_RE, /\s*/,
/class/, /\s+/,
IDENT_RE, /\s*/,
/\(\s*/, IDENT_RE,/\s*\)/
],
},
{
match: [
/class/, /\s+/,
/class/, /\s+/,
IDENT_RE
],
}
Expand Down