embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove JSON as supported language 

It seems to break the theme setting.
An issue has been opened
This commit is contained in:
Anthony Laibe 2018-10-02 11:01:56 +01:00 committed by Pascal Precht
parent 572cd20482
commit c4635dd6bd
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
embark-ui/src/components/TextEditor.js
View File

@ -2,11 +2,11 @@ import React from 'react';
import MonacoEditor from 'react-monaco-editor';
import PropTypes from 'prop-types';
const SUPPORTED_LANGUAGES = ['css', 'sol', 'html', 'json'];
const SUPPORTED_LANGUAGES = ['css', 'sol', 'html'];
const DEFAULT_LANGUAGE = 'javascript';
class TextEditor extends React.Component {
language() {
getLanguage() {
const extension = this.props.file.name.split('.').pop();
return SUPPORTED_LANGUAGES[SUPPORTED_LANGUAGES.indexOf(extension)] || DEFAULT_LANGUAGE;
}
@ -33,6 +33,13 @@ class TextEditor extends React.Component {
};
});
this.state.monaco.editor.setModelMarkers(this.state.editor.getModel(), 'test', markers);
const newLanguage = this.getLanguage();
const currentLanguage = this.state.editor.getModel().getModeId();
if (newLanguage !== currentLanguage) {
this.state.monaco.editor.setModelLanguage(this.state.editor.getModel(), newLanguage);
}
}
editorDidMount(editor, monaco) {
@ -44,7 +51,6 @@ class TextEditor extends React.Component {
<MonacoEditor
width="800"
height="600"
language={this.language()}
theme="vs-dark"
value={this.props.file.content}
onChange={this.props.onFileContentChange}