Clean up duplicated keywords #1

Closed

fcsonline wants to merge 1 commit from feature/dont-overwrite-keywords into main

pull from: feature/dont-overwrite-keywords

merge into: codemirror:main

codemirror:main

Conversation 7 Commits 1 Files changed 2 +22 -13

fcsonline commented 2021-09-15 17:14:45 +02:00 (Migrated from github.com)

Copy link

Removed some keywords that were duplicated in the dialect configuration.

This is the list of duplicated keywords that have been detected:

Duplicated keyword 'path'. Overwriting with a Type
Duplicated keyword 'without'. Overwriting with a Type
Duplicated keyword 'zone'. Overwriting with a Type
Duplicated keyword 'with'. Overwriting with a Type
Duplicated keyword 'blob'. Overwriting with a Type
Duplicated keyword 'year'. Overwriting with a Type
Duplicated keyword 'connect'. Overwriting with a Builtin
Duplicated keyword 'exit'. Overwriting with a Builtin
Duplicated keyword 'go'. Overwriting with a Builtin
Duplicated keyword 'blob'. Overwriting with a Type
Duplicated keyword 'year'. Overwriting with a Type
Duplicated keyword 'connect'. Overwriting with a Builtin
Duplicated keyword 'exit'. Overwriting with a Builtin
Duplicated keyword 'go'. Overwriting with a Builtin
Duplicated keyword 'cursor'. Overwriting with a Type
Duplicated keyword 'table'. Overwriting with a Type
Duplicated keyword 'blob'. Overwriting with a Type
Duplicated keyword 'year'. Overwriting with a Type
Duplicated keyword 'binary'. Overwriting with a Builtin
Duplicated keyword 'check'. Overwriting with a Builtin
Duplicated keyword 'exit'. Overwriting with a Builtin
Duplicated keyword 'limit'. Overwriting with a Builtin
Duplicated keyword 'open'. Overwriting with a Builtin
Duplicated keyword 'output'. Overwriting with a Builtin
Duplicated keyword 'read'. Overwriting with a Builtin
Duplicated keyword 'schema'. Overwriting with a Builtin
Duplicated keyword 'session'. Overwriting with a Builtin
Duplicated keyword 'array'. Overwriting with a Type
Duplicated keyword 'boolean'. Overwriting with a Type
Duplicated keyword 'char'. Overwriting with a Type
Duplicated keyword 'date'. Overwriting with a Type
Duplicated keyword 'decimal'. Overwriting with a Type
Duplicated keyword 'object'. Overwriting with a Type
Duplicated keyword 'blob'. Overwriting with a Type
Duplicated keyword 'dec'. Overwriting with a Type
Duplicated keyword 'describe'. Overwriting with a Builtin
Duplicated keyword 'escape'. Overwriting with a Builtin
Duplicated keyword 'exec'. Overwriting with a Builtin
Duplicated keyword 'execute'. Overwriting with a Builtin
Duplicated keyword 'long'. Overwriting with a Builtin
Duplicated keyword 'release'. Overwriting with a Builtin
Duplicated keyword 'size'. Overwriting with a Builtin
Duplicated keyword 'time'. Overwriting with a Builtin

The main reason for this change is to guarantee the styling and highlighting
of the most important tokens in the language.

In this case, LIMIT is a standard SQL token, but also a builtin keyword for SQLite

Removed some keywords that were duplicated in the dialect configuration. This is the list of duplicated keywords that have been detected: ``` Duplicated keyword 'path'. Overwriting with a Type Duplicated keyword 'without'. Overwriting with a Type Duplicated keyword 'zone'. Overwriting with a Type Duplicated keyword 'with'. Overwriting with a Type Duplicated keyword 'blob'. Overwriting with a Type Duplicated keyword 'year'. Overwriting with a Type Duplicated keyword 'connect'. Overwriting with a Builtin Duplicated keyword 'exit'. Overwriting with a Builtin Duplicated keyword 'go'. Overwriting with a Builtin Duplicated keyword 'blob'. Overwriting with a Type Duplicated keyword 'year'. Overwriting with a Type Duplicated keyword 'connect'. Overwriting with a Builtin Duplicated keyword 'exit'. Overwriting with a Builtin Duplicated keyword 'go'. Overwriting with a Builtin Duplicated keyword 'cursor'. Overwriting with a Type Duplicated keyword 'table'. Overwriting with a Type Duplicated keyword 'blob'. Overwriting with a Type Duplicated keyword 'year'. Overwriting with a Type Duplicated keyword 'binary'. Overwriting with a Builtin Duplicated keyword 'check'. Overwriting with a Builtin Duplicated keyword 'exit'. Overwriting with a Builtin Duplicated keyword 'limit'. Overwriting with a Builtin Duplicated keyword 'open'. Overwriting with a Builtin Duplicated keyword 'output'. Overwriting with a Builtin Duplicated keyword 'read'. Overwriting with a Builtin Duplicated keyword 'schema'. Overwriting with a Builtin Duplicated keyword 'session'. Overwriting with a Builtin Duplicated keyword 'array'. Overwriting with a Type Duplicated keyword 'boolean'. Overwriting with a Type Duplicated keyword 'char'. Overwriting with a Type Duplicated keyword 'date'. Overwriting with a Type Duplicated keyword 'decimal'. Overwriting with a Type Duplicated keyword 'object'. Overwriting with a Type Duplicated keyword 'blob'. Overwriting with a Type Duplicated keyword 'dec'. Overwriting with a Type Duplicated keyword 'describe'. Overwriting with a Builtin Duplicated keyword 'escape'. Overwriting with a Builtin Duplicated keyword 'exec'. Overwriting with a Builtin Duplicated keyword 'execute'. Overwriting with a Builtin Duplicated keyword 'long'. Overwriting with a Builtin Duplicated keyword 'release'. Overwriting with a Builtin Duplicated keyword 'size'. Overwriting with a Builtin Duplicated keyword 'time'. Overwriting with a Builtin ``` The main reason for this change is to guarantee the styling and highlighting of the most important tokens in the language.  In this case, `LIMIT` is a standard SQL token, but also a builtin keyword for SQLite

marijnh commented 2021-09-15 17:19:20 +02:00 (Migrated from github.com)

Copy link

Wouldn't a more reasonable fix be to remove the word from the list of builtins for SQLite?

Wouldn't a more reasonable fix be to remove the word from the list of builtins for SQLite?

fcsonline commented 2021-09-16 16:00:33 +02:00 (Migrated from github.com)

Copy link

@marijnh It can be a solution. I added a check to know if something common and it detected many.

@marijnh It can be a solution. I added a check to know if something common and it detected many.

marijnh commented 2021-09-16 16:02:06 +02:00 (Migrated from github.com)

Copy link

It seems pointless to include duplicates words in these definitions, so I think removing those is what we want to do here.

It seems pointless to include duplicates words in these definitions, so I think removing those is what we want to do here.

fcsonline commented 2021-09-16 18:19:33 +02:00 (Migrated from github.com)

Copy link

Ok. I'll do this then.

Ok. I'll do this then.

fcsonline commented 2021-09-17 23:19:20 +02:00 (Migrated from github.com)

Copy link

Done. Let me know what do you think.

Done. Let me know what do you think.

marijnh commented 2021-09-18 09:53:53 +02:00 (Migrated from github.com)

Copy link

Thanks! Merged as 1b848bb , which is your patch without the dynamic check/warning.

Thanks! Merged as 1b848bb , which is your patch without the dynamic check/warning.

fcsonline commented 2021-09-18 10:01:39 +02:00 (Migrated from github.com)

Copy link

I added the warning to catch future duplicates, but it is ok.

I added the warning to catch future duplicates, but it is ok.

Pull request closed

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

codemirror/lang-sql!1

No description provided.