VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-07-23 00:47:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2025-07-07 15:12:24 +00:00
parent 64717d4180
commit 5d8fa5ee83
54 changed files with 885 additions and 1306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
patches/highlight.js+11.11.1.patch
View File

@ -1,8 +1,8 @@
diff --git a/node_modules/highlight.js/es/languages/ruby.js b/node_modules/highlight.js/es/languages/ruby.js
index 2b1d275..afbd10e 100644
index 2b1d275..2876e07 100644
--- a/node_modules/highlight.js/es/languages/ruby.js
+++ b/node_modules/highlight.js/es/languages/ruby.js
@@ -227,6 +227,27 @@ function ruby(hljs) {
@@ -227,6 +227,34 @@ function ruby(hljs) {
]
};
@ -12,6 +12,14 @@ index 2b1d275..afbd10e 100644
+ hljs.BACKSLASH_ESCAPE,
+ SUBST,
+ {
+ begin: /\[/,
+ end: /\]/,
+ contains: [
+ hljs.BACKSLASH_ESCAPE,
+ { begin: /\\./ }
+ ]
+ },
+ {
+ begin: /\{/, end: /\}/,
+ contains: ['self', hljs.BACKSLASH_ESCAPE, SUBST],
+ relevance: 0
@ -20,17 +28,16 @@ index 2b1d275..afbd10e 100644
+ illegal: /\n/,
+ variants: [
+ { begin: /%r\{/, end: /\}[a-z]*/ },
+ { begin: '%r\\(', end: '\\)[a-z]*' },
+ { begin: '%r!', end: '![a-z]*' },
+ { begin: '%r\\[', end: '\\][a-z]*' },
+ { begin: '/', end: '/[a-z]*' }
+ { begin: /%r\(/, end: /\)[a-z]*/ },
+ { begin: /%r!/, end: /![a-z]*/ },
+ { begin: /%r\[/, end: /\][a-z]*/ }
+ ]
+ };
+
const PARAMS = {
variants: [
{
@@ -324,6 +345,7 @@ function ruby(hljs) {
@@ -324,6 +352,7 @@ function ruby(hljs) {
UPPER_CASE_CONSTANT,
CLASS_REFERENCE,
METHOD_DEFINITION,
@ -38,10 +45,11 @@ index 2b1d275..afbd10e 100644
{
// swallow namespace qualifiers before symbols
begin: hljs.IDENT_RE + '::' },
@@ -373,22 +395,6 @@ function ruby(hljs) {
@@ -372,22 +401,6 @@ function ruby(hljs) {
{
begin: '/',
end: '/[a-z]*'
},
- },
- {
- begin: /%r\{/,
- end: /\}[a-z]*/
@ -57,7 +65,76 @@ index 2b1d275..afbd10e 100644
- {
- begin: '%r\\[',
- end: '\\][a-z]*'
- }
}
]
}
diff --git a/node_modules/highlight.js/lib/languages/ruby.js b/node_modules/highlight.js/lib/languages/ruby.js
index e128206..b5c3348 100644
--- a/node_modules/highlight.js/lib/languages/ruby.js
+++ b/node_modules/highlight.js/lib/languages/ruby.js
@@ -227,6 +227,34 @@ function ruby(hljs) {
]
};
+ const REGEXP = {
+ className: 'regexp',
+ contains: [
+ hljs.BACKSLASH_ESCAPE,
+ SUBST,
+ {
+ begin: /\[/,
+ end: /\]/,
+ contains: [
+ hljs.BACKSLASH_ESCAPE,
+ { begin: /\\./ }
+ ]
+ },
+ {
+ begin: /\{/, end: /\}/,
+ contains: ['self', hljs.BACKSLASH_ESCAPE, SUBST],
+ relevance: 0
+ }
+ ],
+ illegal: /\n/,
+ variants: [
+ { begin: /%r\{/, end: /\}[a-z]*/ },
+ { begin: /%r\(/, end: /\)[a-z]*/ },
+ { begin: /%r!/, end: /![a-z]*/ },
+ { begin: /%r\[/, end: /\][a-z]*/ }
+ ]
+ };
+
const PARAMS = {
variants: [
{
@@ -324,6 +352,7 @@ function ruby(hljs) {
UPPER_CASE_CONSTANT,
CLASS_REFERENCE,
METHOD_DEFINITION,
+ REGEXP,
{
// swallow namespace qualifiers before symbols
begin: hljs.IDENT_RE + '::' },
@@ -372,22 +401,6 @@ function ruby(hljs) {
{
begin: '/',
end: '/[a-z]*'
- },
- {
- begin: /%r\{/,
- end: /\}[a-z]*/
- },
- {
- begin: '%r\\(',
- end: '\\)[a-z]*'
- },
- {
- begin: '%r!',
- end: '![a-z]*'
- },
- {
- begin: '%r\\[',
- end: '\\][a-z]*'
}
]
}
].concat(IRB_OBJECT, COMMENT_MODES),