Skip to content

Commit

Permalink
Update Ace Editor version (getredash#5041)
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrieldutra authored and andrewdever committed Oct 5, 2020
1 parent c32b77a commit 83836f3
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 25 deletions.
18 changes: 8 additions & 10 deletions client/app/components/queries/QueryEditor/ace.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { isNil, map } from "lodash";
import AceEditor from "react-ace";
import ace from "brace";
import ace from "ace-builds";

import "brace/ext/language_tools";
import "brace/mode/json";
import "brace/mode/python";
import "brace/mode/sql";
import "brace/mode/yaml";
import "brace/theme/textmate";
import "brace/ext/searchbox";
import "ace-builds/src-noconflict/ext-language_tools";
import "ace-builds/src-noconflict/mode-json";
import "ace-builds/src-noconflict/mode-python";
import "ace-builds/src-noconflict/mode-sql";
import "ace-builds/src-noconflict/mode-yaml";
import "ace-builds/src-noconflict/theme-textmate";
import "ace-builds/src-noconflict/ext-searchbox";

const langTools = ace.acequire("ace/ext/language_tools");
const snippetsModule = ace.acequire("ace/snippets");
Expand All @@ -31,12 +31,10 @@ function buildTableColumnKeywords(table) {
const keywords = [];
table.columns.forEach(column => {
keywords.push({
caption: column,
name: `${table.name}.${column}`,
value: `${table.name}.${column}`,
score: 100,
meta: "Column",
className: "completion",
});
});
return keywords;
Expand Down
26 changes: 13 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
"@types/prop-types": "^15.5.2",
"@types/react": "^16.3.13",
"@types/react-dom": "^16.0.5",
"ace-builds": "^1.4.12",
"antd": "^3.26.17",
"axios": "^0.19.0",
"bootstrap": "^3.3.7",
"brace": "^0.11.0",
"classnames": "^2.2.6",
"d3": "^3.5.17",
"debug": "^3.1.0",
Expand All @@ -68,7 +68,7 @@
"prop-types": "^15.6.1",
"query-string": "^6.9.0",
"react": "^16.8.3",
"react-ace": "^6.1.0",
"react-ace": "^9.1.1",
"react-dom": "^16.8.3",
"react-grid-layout": "^0.18.2",
"react-resizable": "^1.10.1",
Expand Down

0 comments on commit 83836f3

Please sign in to comment.