Fix syntax highlighting for go files

This commit is contained in:
Sebastian Sdorra
2020-10-23 10:35:13 +02:00
parent d2d237e0c2
commit 0d31ad2138
9 changed files with 1049 additions and 1672 deletions

View File

@@ -26,6 +26,7 @@ import styled from "styled-components";
// @ts-ignore we have no typings for react-diff-view
import { Diff, useTokenizeWorker } from "react-diff-view";
import { File } from "./DiffTypes";
import { determineLanguage } from "../languages";
// styling for the diff tokens
// this must be aligned with th style, which is used in the SyntaxHighlighter component
@@ -86,17 +87,10 @@ type Props = {
className?: string;
};
const determineLanguage = (file: File) => {
if (file.language) {
return file.language.toLowerCase();
}
return "text";
};
const TokenizedDiffView: FC<Props> = ({ file, viewType, className, children }) => {
const { tokens } = useTokenizeWorker(tokenize, {
hunks: file.hunks,
language: determineLanguage(file)
language: determineLanguage(file.language)
});
return (

View File

@@ -67,7 +67,7 @@ const commitImplementMain = {
};
const source: AnnotatedSource = {
language: "go",
language: "golang",
lines: [
{
lineNumber: 1,

View File

@@ -35,6 +35,7 @@ import { DateInput } from "../../useDateFormatter";
import Popover from "./Popover";
import AnnotateLine from "./AnnotateLine";
import { Action } from "./actions";
import { determineLanguage } from "../../languages";
type Props = {
source: AnnotatedSource;
@@ -147,7 +148,7 @@ const Annotate: FC<Props> = ({ source, repository, baseDate }) => {
{popover}
<ReactSyntaxHighlighter
showLineNumbers={false}
language={source.language ? source.language : "text"}
language={determineLanguage(source.language)}
style={highlightingTheme}
renderer={defaultRenderer}
>