add auto detection for languages

main
briandennis 7 years ago
parent dd9ba60d70
commit 535da42962

@ -1,10 +1,11 @@
import { EOL } from 'os' import { EOL } from 'os'
import * as hljs from 'highlight.js'
import React from 'react' import React from 'react'
import domtoimage from 'dom-to-image' import domtoimage from 'dom-to-image'
import CodeMirror from 'react-codemirror' import CodeMirror from 'react-codemirror'
import Spinner from 'react-spinner' import Spinner from 'react-spinner'
import WindowControls from '../components/WindowControls' import WindowControls from '../components/WindowControls'
import { COLORS, DEFAULT_LANGUAGE } from '../lib/constants' import { COLORS, DEFAULT_LANGUAGE, LANGUAGE_HASH } from '../lib/constants'
const DEFAULT_SETTINGS = { const DEFAULT_SETTINGS = {
paddingVertical: '50px', paddingVertical: '50px',
@ -21,35 +22,47 @@ class Carbon extends React.Component {
super(props) super(props)
this.state = { this.state = {
loading: true loading: true,
language: props.config.language
} }
this.detectLanguage = this.detectLanguage.bind(this) this.handleLanguageChange = this.handleLanguageChange.bind(this)
} }
componentDidMount() { componentDidMount() {
this.setState({ this.setState({
loading: false loading: false
}) })
this.handleLanguageChange(this.props.children)
} }
detectLanguage () { componentWillReceiveProps (newProps) {
return 'javascript' this.handleLanguageChange(newProps.children, { customProps: newProps })
} }
render () { handleLanguageChange(newCode, config) {
const config = Object.assign(DEFAULT_SETTINGS, this.props.config) const props = (config && config.customProps) || this.props
let language if (props.config.language.name === 'Auto') {
if (config.language.name === 'Auto') { // try to set the language
language = this.detectLanguage(this.props.children) const detectedLanguage = hljs.highlightAuto(newCode).language
const languageModule = LANGUAGE_HASH[detectedLanguage]
if (languageModule) {
this.setState({ language: languageModule })
}
} else { } else {
language = config.language.module || 'plaintext' this.setState({ language: props.config.language })
} }
}
render () {
const config = Object.assign(DEFAULT_SETTINGS, this.props.config)
const options = { const options = {
lineNumbers: false, lineNumbers: false,
mode: language, mode: this.state.language ? this.state.language.module : 'plaintext',
theme: config.theme, theme: config.theme,
scrollBarStyle: null, scrollBarStyle: null,
viewportMargin: Infinity, viewportMargin: Infinity,
@ -80,6 +93,7 @@ class Carbon extends React.Component {
{ config.windowControls ? <WindowControls theme={config.windowTheme} /> : null } { config.windowControls ? <WindowControls theme={config.windowTheme} /> : null }
<CodeMirror <CodeMirror
className={`CodeMirror__container window-theme__${config.windowTheme} ${config.dropShadow ? 'dropshadow' : ''}`} className={`CodeMirror__container window-theme__${config.windowTheme} ${config.dropShadow ? 'dropshadow' : ''}`}
onChange={this.handleLanguageChange}
value={this.props.children} value={this.props.children}
options={options} options={options}
/> />

Loading…
Cancel
Save