Skip to content

Commit 5d76e0b

Browse files
authored
Merge pull request #1903 from processing/feature/glsl-mode
[#1885] Update mode name for GLSL files
2 parents 998a0eb + d3c2d22 commit 5d76e0b

File tree

2 files changed

+5
-318
lines changed

2 files changed

+5
-318
lines changed

client/modules/IDE/components/Editor.jsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import cssParser from 'prettier/parser-postcss';
99
import { withTranslation } from 'react-i18next';
1010
import StackTrace from 'stacktrace-js';
1111
import 'codemirror/mode/css/css';
12+
import 'codemirror/mode/clike/clike';
1213
import 'codemirror/addon/selection/active-line';
1314
import 'codemirror/addon/lint/lint';
1415
import 'codemirror/addon/lint/javascript-lint';
@@ -38,7 +39,6 @@ import { connect } from 'react-redux';
3839
import { bindActionCreators } from 'redux';
3940
import '../../../utils/htmlmixed';
4041
import '../../../utils/p5-javascript';
41-
import '../../../utils/webGL-clike';
4242
import Timer from '../components/Timer';
4343
import EditorAccessibility from '../components/EditorAccessibility';
4444
import { metaKey } from '../../../utils/metaKey';
@@ -304,8 +304,10 @@ class Editor extends React.Component {
304304
mode = 'htmlmixed';
305305
} else if (fileName.match(/.+\.json$/i)) {
306306
mode = 'application/json';
307-
} else if (fileName.match(/.+\.(frag|vert)$/i)) {
308-
mode = 'clike';
307+
} else if (fileName.match(/.+\.(frag|glsl)$/i)) {
308+
mode = 'x-shader/x-fragment';
309+
} else if (fileName.match(/.+\.(vert)$/i)) {
310+
mode = 'x-shader/x-vertex';
309311
} else {
310312
mode = 'text/plain';
311313
}

client/utils/webGL-clike.js

Lines changed: 0 additions & 315 deletions
This file was deleted.

0 commit comments

Comments
 (0)