diff --git a/.all-contributorsrc b/.all-contributorsrc index 0c8d09b4399d9d3ceccf4464aad47051b0592fb5..c5b4c724f4f35e1467cdfec1b5f04098059d7f77 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -58,7 +58,7 @@ }, { "login": "mick2004", - "name": "Abhishek Pratap Singh", + "name": "mick2004", "avatar_url": "https://avatars1.githubusercontent.com/u/2042132?v=4", "profile": "https://github.com/mick2004", "contributions": [ diff --git a/README.md b/README.md index 3bf42c293fed72d6e3ea40117e93c47415b40564..fe28a840266d14fd07764cdf6aa4605198492505 100644 --- a/README.md +++ b/README.md @@ -201,7 +201,7 @@ Thanks to these wonderful people
tonytamwk
💻 📓
sirinath
🤔
igor-suhorukov
💻 🤔 -
Abhishek Pratap Singh
💻 📦 +
mick2004
💻 📦 diff --git a/ui/package-lock.json b/ui/package-lock.json index 78189dad69cdd4caa3c6e6219f76792919ac1d28..61f9d790897711d331b142633b4cc673a785066f 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -1233,6 +1233,11 @@ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.4.2.tgz", "integrity": "sha512-JlGTGRYHC2QK+DDbePyXdBdooxFq2+noLfWpRqJtkxcb/oYWzOF0kcbfvvbWrwevCC1l6hLUg1wHYT+ona5BWQ==" }, + "@questdb/sql-grammar": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@questdb/sql-grammar/-/sql-grammar-1.0.4.tgz", + "integrity": "sha512-vFULeIrl+ZnnA9WPXHJOR65uQFtCfzfp6R71QwODwIskDbLzH7xfErl2b6aew3TsU9ol6cXIxEBY5QH57e96Uw==" + }, "@styled-icons/boxicons-logos": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/@styled-icons/boxicons-logos/-/boxicons-logos-10.0.0.tgz", @@ -7461,9 +7466,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" }, "lodash.defaults": { "version": "4.2.0", diff --git a/ui/package.json b/ui/package.json index ea0f324a64c161006964fc2e6b04404b6c46e24b..9d4cf33d543101ab06f6ac37e75e8694ee9de6bf 100644 --- a/ui/package.json +++ b/ui/package.json @@ -23,6 +23,7 @@ "@babel/runtime-corejs3": "7.10.2", "@fortawesome/fontawesome-free": "5.13.0", "@popperjs/core": "2.4.2", + "@questdb/sql-grammar": "1.0.4", "@types/react": "16.9.35", "@types/react-dom": "16.9.8", "@types/react-redux": "7.1.9", diff --git a/ui/src/scenes/Editor/Ace/questdbMode.ts b/ui/src/scenes/Editor/Ace/questdbMode.ts index 21bb7d908e0a887e50a041f4e8adac718c17b5c0..0c8d22f4d5b6d1a86d5c8834b39e98e65f252e69 100644 --- a/ui/src/scenes/Editor/Ace/questdbMode.ts +++ b/ui/src/scenes/Editor/Ace/questdbMode.ts @@ -1,6 +1,7 @@ import ace, { Ace } from "ace-builds" import "ace-builds/src-noconflict/mode-sql" import "ace-builds/src-noconflict/theme-dracula" +import { constants, dataTypes, functions, keywords } from "@questdb/sql-grammar" type Mapper = (name: string) => void @@ -29,160 +30,12 @@ const { Mode: SqlMode } = ace.require("ace/mode/sql") as { Mode: unknown } const oop = ace.require("ace/lib/oop") as { inherits: (a: any, b: any) => void } const QuestDBHighlightRules = function (this: HighlightRules) { - const keywords = [ - "add", - "alter", - "and", - "as", - "asc", - "asof", - "by", - "cache", - "capacity", - "case", - "column", - "columns", - "copy", - "create", - "cross", - "database", - "default", - "delete", - "desc", - "distinct", - "drop", - "else", - "end", - "foreign", - "from", - "grant", - "group", - "if", - "index", - "inner", - "insert", - "into", - "join", - "key", - "latest", - "left", - "limit", - "nan", - "natural", - "nocache", - "not", - "null", - "on", - "or", - "order", - "outer", - "over", - "partition", - "primary", - "references", - "rename", - "right", - "sample", - "select", - "show", - "splice", - "table", - "tables", - "then", - "truncate", - "type", - "union", - "update", - "values", - "when", - "where", - "with", - ] - const builtinConstants = ["false", "true"] - const builtinFunctions = [ - "abs", - "all_tables", - "avg", - "coalesce", - "concat", - "count", - "dateadd", - "datediff", - "day", - "day_of_week", - "day_of_week_sunday_first", - "days_in_month", - "first", - "format", - "hour", - "ifnull", - "is_leap_year", - "isnull", - "ksum", - "last", - "lcase", - "len", - "length", - "long_sequence", - "max", - "micros", - "mid", - "millis", - "min", - "minute", - "month", - "now", - "nsum", - "nvl", - "rank", - "rnd_bin", - "rnd_boolean", - "rnd_byte", - "rnd_char", - "rnd_date", - "rnd_double", - "rnd_float", - "rnd_int", - "rnd_long", - "rnd_long256", - "rnd_short", - "rnd_str", - "rnd_symbol", - "rnd_timestamp", - "round", - "round_down", - "round_half_even", - "round_up", - "second", - "sum", - "sysdate", - "systimestamp", - "tables_columns", - "timestamp_sequence", - "to_date", - "to_str", - "to_timestamp", - "ucase", - "year", - ] - const dataTypes = [ - "binary", - "date", - "double", - "float", - "int", - "long", - "long256", - "short", - "string", - "symbol", - "timestamp", - ] const keywordMapper = this.createKeywordMapper( { - keyword: [keywords, builtinFunctions, builtinConstants, dataTypes] - .map((k) => k.join("|")) - .join("|"), + "support.function": functions.join("|"), + keyword: keywords.join("|"), + "constant.language": constants.join("|"), + "storage.type": dataTypes.join("|"), }, "identifier", true, @@ -201,7 +54,7 @@ const QuestDBHighlightRules = function (this: HighlightRules) { }, { token: "string", // " string - regex: '".*?"', + regex: "'.*?'", }, { token: "constant", // ' string @@ -221,7 +74,7 @@ const QuestDBHighlightRules = function (this: HighlightRules) { }, { token: "keyword.operator", - regex: "\\+|\\-|\\/|\\/\\/|%|<@>|@>|<@|&|\\^|~|<|>|<=|=>|==|!=|<>|=", + regex: "\\+|\\-|\\/|\\/\\/|%|<@>|@>|<@|&|\\^|~|<|>|<=|=>|==|!=|<>|=|!~", }, { token: "paren.lparen", diff --git a/ui/src/styles/_editor.scss b/ui/src/styles/_editor.scss index 2c607738a4d117e65f89b89107befaea6350f05b..d10852a0e27ba74f15a2b6545cdaffe07ac02b7c 100644 --- a/ui/src/styles/_editor.scss +++ b/ui/src/styles/_editor.scss @@ -42,7 +42,7 @@ #sqlEditor { flex: 1; - font: 1.4rem "Source Code Pro", monospace !important; + font-family: 1.4rem SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !important; line-height: 1.5em !important; } diff --git a/ui/src/styles/_grid.scss b/ui/src/styles/_grid.scss index 9f7abdecbd368063e418bf26a10a6865b953e611..bafffb54fedcc54f5d8d9e5810900a2f43394188 100644 --- a/ui/src/styles/_grid.scss +++ b/ui/src/styles/_grid.scss @@ -26,7 +26,7 @@ height: 100%; width: 100%; flex-direction: column; - font-family: "Source Code Pro", monospace; + font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; overflow: hidden; } diff --git a/ui/src/theme/index.ts b/ui/src/theme/index.ts index c194c5806b6b83494f170aecb4dec5890b5a3762..32cfb06ae37a9dd868f00bc335063236970b7a7c 100644 --- a/ui/src/theme/index.ts +++ b/ui/src/theme/index.ts @@ -39,7 +39,8 @@ export const theme: DefaultThemeShape = { fontEmoji: '"apple color emoji", "segoe ui emoji", "android emoji", "emojisymbols", "emojione mozilla", "twemoji mozilla", "segoe ui symbol", "noto color emoji"', - fontMonospace: '"Source Code Pro", monospace', + fontMonospace: + 'SFMono-Regular, Menlo, Monaco, Consolas,"Liberation Mono", "Courier New", monospace', fontSize, }