Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-03 03:55:51 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/feature/annotate_prismjs' into feature/syntax-highlighting

Browse Source 
# Conflicts:
#	package.json
#	scm-ui/eslint-config/package.json
#	scm-ui/ui-components/src/SyntaxHighlighter.tsx
#	scm-ui/ui-components/src/repos/annotate/Annotate.tsx
#	scm-ui/ui-plugins/package.json
#	yarn.lock
This commit is contained in:
Konstantin Schaper
2020-10-12 11:23:56 +02:00
parent 0b0df4ed5f a4e6e4186a
commit a043e7f805
6 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-ui/ui-components/src/repos/annotate/Annotate.tsx
View File

@@ -24,10 +24,9 @@
import React, { FC, useReducer } from "react";
import { Repository, AnnotatedSource, AnnotatedLine } from "@scm-manager/ui-types";
// @ts-ignore
import { LightAsync as ReactSyntaxHighlighter, createElement } from "react-syntax-highlighter";
import { arduinoLight } from "react-syntax-highlighter/dist/cjs/styles/hljs";
import { PrismAsyncLight as ReactSyntaxHighlighter, createElement } from "react-syntax-highlighter";
import { ghcolors } from "react-syntax-highlighter/dist/esm/styles/prism";
import { DateInput } from "../../useDateFormatter";
import Popover from "./Popover";
import AnnotateLine from "./AnnotateLine";
@@ -145,7 +144,7 @@ const Annotate: FC<Props> = ({ source, repository, baseDate }) => {
<ReactSyntaxHighlighter
showLineNumbers={false}
language={source.language ? source.language : "text"}
style={arduinoLight}
style={ghcolors}
renderer={defaultRenderer}
>
{code}