mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-07 22:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent linting from breaking code-editor persistence (#2267)

Browse Source 
* Prevent linting from breaking code-editor persistence (Fixes #2234)

* Fix whitespace
This commit is contained in:
Gregory Schier 2020-06-08 16:58:36 -07:00 committed by GitHub
parent 37a711eb6a
commit 8d01d57363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
packages/insomnia-app/app/ui/components/codemirror/code-editor.js
View File

@ -649,25 +649,41 @@ class CodeEditor extends React.Component {
}
// Strip of charset if there is one
const cm = this.codeMirror;
Object.keys(options).map(key => {
let shouldSetOption = false;
if (key === 'jump' || key === 'info' || key === 'lint' || key === 'hintOptions') {
// Use stringify here because these could be infinitely recursive due to GraphQL
// schemas
shouldSetOption = JSON.stringify(options[key]) !== JSON.stringify(cm.options[key]);
} else if (!deepEqual(options[key], cm.options[key])) {
// Don't set the option if it hasn't changed
shouldSetOption = true;
}
if (shouldSetOption) {
cm.setOption(key, options[key]);
}
this._codemirrorSmartSetOption(key, options[key]);
});
}
/**
* Set option if it's different than in the current Codemirror instance
*/
_codemirrorSmartSetOption(key, value) {
const cm = this.codeMirror;
let shouldSetOption = false;
if (key === 'jump' || key === 'info' || key === 'lint' || key === 'hintOptions') {
// Use stringify here because these could be infinitely recursive due to GraphQL
// schemas
shouldSetOption = JSON.stringify(value) !== JSON.stringify(cm.options[key]);
} else if (!deepEqual(value, cm.options[key])) {
// Don't set the option if it hasn't changed
shouldSetOption = true;
}
// Don't set the option if it hasn't changed
if (!shouldSetOption) {
return;
}
// Set the option safely. When setting "lint", for example, it can throw an exception
// and cause the editor to break.
try {
cm.setOption(key, value);
} catch (err) {
console.log('Failed to set CodeMirror option', err.message, { key, value });
}
}
static _normalizeMode(mode) {
const mimeType = mode ? mode.split(';')[0] : 'text/plain';
@ -761,9 +777,9 @@ class CodeEditor extends React.Component {
const value = this.codeMirror.getDoc().getValue();
// Suppress lint on empty doc or single space exists (default value)
if (value.trim() === '') {
this.codeMirror.setOption('lint', false);
this._codemirrorSmartSetOption('lint', false);
} else {
this.codeMirror.setOption('lint', true);
this._codemirrorSmartSetOption('lint', true);
// If we're in single-line mode, merge all changed lines into one
if (this.props.singleLine && change.text && change.text.length > 1) {
const text = change.text
@ -811,7 +827,7 @@ class CodeEditor extends React.Component {
if (shouldLint !== existingLint) {
const { lintOptions } = this.props;
const lint = shouldLint ? lintOptions || true : false;
this.codeMirror.setOption('lint', lint);
this._codemirrorSmartSetOption('lint', lint);
}
this.props.onChange(value);