0dba3ce133
This reverts commit 9551b628d0 (i.e. this is a rollfoward for https://cl.tvl.fyi/c/depot/+/2817)
Change-Id: Iaffcf1cdbe119d26ecb09cc88f9a56436b374c08
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2870
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 7c2e72527d177fd26505821e6297e6aa270a4f96 Mon Sep 17 00:00:00 2001
|
|
From: Luke Granger-Brown <git@lukegb.com>
|
|
Date: Thu, 2 Jul 2020 23:02:43 +0100
|
|
Subject: [PATCH 3/7] Syntax highlight rules.pl
|
|
|
|
---
|
|
.../diff/gr-syntax-layer/gr-syntax-layer.ts | 13 ++++++++++++-
|
|
1 file changed, 12 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.ts b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.ts
|
|
index 2762ccc625..ebb5d9dad9 100644
|
|
--- a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.ts
|
|
+++ b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.ts
|
|
@@ -103,6 +103,10 @@ const LANGUAGE_MAP = new Map<string, string>([
|
|
]);
|
|
const ASYNC_DELAY = 10;
|
|
|
|
+const FILENAME_OVERRIDES = new Map<string, string>([
|
|
+ ['rules.pl', 'prolog'],
|
|
+]);
|
|
+
|
|
const CLASS_SAFELIST = new Set<string>([
|
|
'gr-diff gr-syntax gr-syntax-attr',
|
|
'gr-diff gr-syntax gr-syntax-attribute',
|
|
@@ -241,10 +245,17 @@ export class GrSyntaxLayer implements DiffLayer {
|
|
}
|
|
}
|
|
|
|
+ _basename(filename: string): string {
|
|
+ const pieces = filename.split(/\//);
|
|
+ return pieces[pieces.length-1];
|
|
+ }
|
|
+
|
|
_getLanguage(metaInfo: DiffFileMetaInfo) {
|
|
// The Gerrit API provides only content-type, but for other users of
|
|
// gr-diff it may be more convenient to specify the language directly.
|
|
- return metaInfo.language ?? LANGUAGE_MAP.get(metaInfo.content_type);
|
|
+ return metaInfo.language ??
|
|
+ FILENAME_OVERRIDES.get(this._basename(metaInfo.name)) ??
|
|
+ LANGUAGE_MAP.get(metaInfo.content_type);
|
|
}
|
|
|
|
/**
|
|
--
|
|
2.29.2
|
|
|