Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JavaScript] Clean up imports #3851

Merged
merged 5 commits into from
Oct 1, 2023
Merged

[JavaScript] Clean up imports #3851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78249eb
[JavaScript] Clean up imports
Thom1729 Sep 30, 2023
d2b1132
[JavaScript] Add named context and bailout for `from`
deathaxe Oct 1, 2023
82fb9f5
[JavaScript] Add named context for assert/with objects
deathaxe Oct 1, 2023
379c6fb
[JavaScript] Add named context for default exports
deathaxe Oct 1, 2023
c4cd57b
Merge pull request #3 from deathaxe/pr/javascript/cleanup-imports
Thom1729 Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 32 additions & 47 deletions JavaScript/JavaScript.sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ contexts:
set:
- import-meta
- expect-semicolon
- import-assert
- import-export-assert
- import-string-or-items
- import-check-branch

Expand Down Expand Up @@ -281,7 +281,11 @@ contexts:
import-export-from:
- match: 'from{{identifier_break}}'
scope: keyword.control.import-export.js
set: literal-string
set: import-export-from-name
- include: else-pop

import-export-from-name:
- include: literal-string
- include: else-pop

import-string-or-items:
Expand All @@ -290,49 +294,49 @@ contexts:
set:
- import-export-from
- import-list
- import-export-alias
- import-item
- import-export-item

import-list:
- match: ','
scope: punctuation.separator.comma.js
push:
- import-export-alias
- import-item
push: import-export-item
- include: else-pop

import-item:
import-export-item:
- match: '\{'
scope: punctuation.section.block.begin.js
set: import-brace
set: import-export-brace
- match: '{{non_reserved_identifier}}'
scope: variable.other.readwrite.js
pop: 1
- match: '\*'
scope: constant.other.js
pop: 1
scope: constant.other.wildcard.asterisk.js
set: import-export-alias
- include: else-pop

import-brace:
import-export-brace:
- meta_scope: meta.block.js
- include: comma-separator
- match: '\}'
scope: punctuation.section.block.end.js
pop: 1
- match: '{{identifier_name}}'
scope: variable.other.readwrite.js
push: import-export-alias
- match: (?={{identifier_start}}|'|")
push:
- import-export-alias
- import-export-name
- match: '\*'
scope: constant.other.js
scope: constant.other.wildcard.asterisk.js
push: import-export-alias
- include: else-pop

import-assert:
- match: assert{{identifier_break}}
import-export-assert:
- match: (?:assert|with){{identifier_break}}
scope: keyword.control.import-export.js
set:
- include: object-literal
- include: else-pop
set: import-export-object
- include: else-pop

import-export-object:
- include: object-literal
- include: else-pop

export-statement:
Expand All @@ -350,39 +354,20 @@ contexts:
export-body:
- include: declaration

- match: 'default{{identifier_break}}'
- match: default{{identifier_break}}
scope: keyword.control.import-export.js
set:
- include: declaration
- match: (?=\S)
set: expression-statement
set: export-default

- match: (?=\S)
set:
- expect-semicolon
- import-export-assert
- import-export-from
- export-item

export-item:
- match: '\{'
scope: punctuation.section.block.begin.js
set: export-brace
- match: '\*'
scope: constant.other.js
set: import-export-alias
- include: else-pop
- import-export-item

export-brace:
- meta_scope: meta.block.js
- include: comma-separator
- match: '\}'
scope: punctuation.section.block.end.js
pop: 1
- match: (?={{identifier_start}}|'|")
push:
- import-export-alias
- import-export-name
- include: else-pop
export-default:
- include: declaration
- include: expression-statement

statements:
- match: '\)|\}|\]'
Expand Down
30 changes: 20 additions & 10 deletions JavaScript/TypeScript.sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ contexts:
set:
- expect-semicolon
- import-export-from
- export-item
- import-export-item
- match: (?=\S)
fail: ts-export-type-from

Expand Down Expand Up @@ -180,8 +180,18 @@ contexts:
- ts-type-parameter-list

ts-import-type:
- match: type{{identifier_break}}
scope: keyword.control.import-export.js
- match: (?=type{{identifier_break}})
pop: 1
branch_point: ts-import-type
branch:
- - match: type{{identifier_break}}
scope: keyword.control.import-export.js
set:
- match: (?=,|from{{identifier_break}})
fail: ts-import-type
- include: else-pop
- immediately-pop

- include: else-pop

import-statement:
Expand All @@ -190,20 +200,20 @@ contexts:
set:
- import-meta
- expect-semicolon
- import-assert
- import-export-assert
- import-string-or-items
- ts-import-type
- import-check-branch

import-brace:
- meta_prepend: true
- match: type{{identifier_break}}
scope: keyword.control.import-export.js

export-brace:
import-export-brace:
- meta_prepend: true
- match: type{{identifier_break}}
scope: keyword.control.import-export.js
- match: (?={{identifier_start}}|'|")
push:
- import-export-alias
- import-export-name
- ts-import-type

ts-type-declaration:
- match: type{{identifier_break}}
Expand Down
41 changes: 37 additions & 4 deletions JavaScript/tests/syntax_test_js_import_export.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,17 @@ import thing, {identifier as otherIdentifier}, * as otherName from "otherplace";
// ^ variable.other.readwrite
// ^ keyword.control.import-export
// ^ variable.other.readwrite
// ^ constant.other.js
// ^ constant.other.wildcard.asterisk
// ^ keyword.control.import-export

import 'module';
// ^^^^^^^^^^^^^ meta.import

import foo from 'bar' assert // incomplete!
//^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.import.js

import foo from 'bar' assert { type: "json" };
// <- meta.import.js keyword.control.import-export.js
//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.import.js
//^^^^ keyword.control.import-export.js
// ^^^ variable.other.readwrite.js
Expand All @@ -46,6 +50,10 @@ import foo from 'bar' assert { type: "json" };
// ^ punctuation.section.mapping.end.js
// ^ punctuation.terminator.statement.js


import foo from 'bar' assert { type: "json" };
// ^^^^^^ meta.import keyword.control.import-export

// Better highlighting while typing.
import
import;
Expand Down Expand Up @@ -111,7 +119,14 @@ export class Foo {};
// ^^^^^^^^^^^^ meta.class
// ^ punctuation.terminator.statement.empty

export default
// <- meta.export.js keyword.control.import-export.js
//^^^^^^^^^^^^^ meta.export.js
//^^^^ keyword.control.import-export.js
// ^^^^^^^ keyword.control.import-export.js

export default expression;
// <- meta.export.js keyword.control.import-export.js
//^^^^^^^^^^^^^^^^^^^^^^^^ meta.export
//^ keyword.control.import-export
// ^ keyword.control.import-export
Expand Down Expand Up @@ -157,10 +172,16 @@ export { name1 as default };
// ^ keyword.control.import-export
// ^ keyword.control.import-export

export * from // incomplete, missing source!
//^^^^^^^^^^^^ meta.export.js
//^^^^ keyword.control.import-export.js
// ^ constant.other.wildcard.asterisk.js
// ^^^^ keyword.control.import-export.js

export * from "./othermod";
//^^^^^^^^^^^^^^^^^^^^^^^^^ meta.export
//^ keyword.control.import-export
// ^ constant.other
// ^ constant.other.wildcard.asterisk
// ^ keyword.control.import-export

export { name1, name2 } from "./othermod";
Expand Down Expand Up @@ -210,14 +231,26 @@ export { member as
let from;
// ^^^^ variable.other.readwrite.js

import from from // incomplete, missing source!
// <- meta.import.js keyword.control.import-export.js
// ^^^^ variable.other.readwrite.js

import from from "./othermod";
// <- meta.import.js keyword.control.import-export.js
// ^^^^ variable.other.readwrite.js

import { from } from "./othermod";
// ^^^^ variable.other.readwrite.js

export { from } from "./othermod";
// ^^^^ variable.other.readwrite.js
export {} from "./othermod" with {};
//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.export
//^^^^ keyword.control.import-export
// ^^ meta.block
// ^^^^ keyword.control.import-export
// ^^^^^^^^^^^^ meta.string string.quoted.double
// ^^^^ keyword.control.import-export
// ^^ meta.mapping
// ^ punctuation.terminator.statement

export default$
// ^^^^^^^^ - keyword
Expand Down
8 changes: 8 additions & 0 deletions JavaScript/tests/syntax_test_typescript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,14 @@ import foo;
// ^^^^ keyword.control.import-export
// ^^^^^^^^^^^ meta.string string.quoted.single

import type from 'somewhere';
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.import
// ^^^^^^ keyword.control.import-export
// ^^^^ variable.other.readwrite
// ^^^^ keyword.control.import-export
// ^^^^^^^^^^^ meta.string string.quoted.single
// ^ punctuation.terminator.statement

import type { U, V } from 'somewhere';
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.import
// ^^^^^^ keyword.control.import-export
Expand Down