From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sun, 23 Apr 2017 01:03:52 +0000 (+0200)
Subject: source: move highlighting setup into eval
X-Git-Tag: v1.10~83
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/960c886e066511719b1a75dc6f237073d71ff02a

source: move highlighting setup into eval

Fallback to plain text if vim fails for whatever reason.
---

diff --git a/source.plp b/source.plp
index 2b13371..1f934ae 100644
--- a/source.plp
+++ b/source.plp
@@ -67,21 +67,24 @@ else {
 	}
 	-r $source or die "Requested file not found\n";
 
-	if (eval { require Text::VimColor and Text::VimColor->VERSION(0.12) }) {
+	if (my $hl = eval {
+		require Text::VimColor;
+		Text::VimColor->VERSION(0.12)
+			or die 'early versions are buggy under FastCGI';
 		delete $Text::VimColor::SYNTAX_TYPE{Underlined};
+		return Text::VimColor->new(
+			file => $source,
+			vim_options => [@Text::VimColor::VIM_OPTIONS, '+:set enc=utf-8'],
+		)->marked;
+	}) {
 		my %TYPETAG = (
 			Statement => 'strong',
 			Error     => 'em',
 			Todo      => 'em',
 		);
 
-		my $hl = Text::VimColor->new(
-			file => $source,
-			vim_options => [@Text::VimColor::VIM_OPTIONS, '+:set enc=utf-8'],
-		);
-		my $parsed = $hl->marked;
 		say '<pre>';
-		foreach (@$parsed) {
+		foreach (@{$hl}) {
 			my ($type, $contents) = @{$_};
 			$contents = decode_utf8($contents);
 			my $tag = $type && ($TYPETAG{$type} || 'span');