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

[D] Separate built-in type-aliases from built-in types #3965

Merged
merged 7 commits into from
Apr 27, 2024
Merged

[D] Separate built-in type-aliases from built-in types #3965

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4954c34
[D] Separate built-in type-aliases from built-in types
ichordev Apr 25, 2024
d5270fd
[D] Fix built-in type-aliases as keys in associative arrays
ichordev Apr 25, 2024
f7c0ccc
[D] Add missing scopes to builtin_type_alias; Fix test
ichordev Apr 25, 2024
293f860
[D] Remove type aliases storage.type.d; Add noreturn to aliases
ichordev Apr 25, 2024
ae814ba
[D] Remove built-in type-alias storage.type.d; Fix indent & tests
ichordev Apr 26, 2024
da7d773
Merge remote-tracking branch 'upstream/master' into builtin-alias
ichordev Apr 26, 2024
c8712f3
[D] Update syntax_test_old
ichordev Apr 26, 2024
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
22 changes: 15 additions & 7 deletions D/D.sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ variables:
construction_lookahead: '(?=~?\s*this\s*\()'

keyword: 'else|enum|export|extern|debug|default|delegate|delete|deprecated|do|body|break|case|cast|catch|class|const|continue|abstract|alias|align|asm|assert|auto|final|finally|for|foreach|foreach_reverse|function|goto|if|immutable|import|in|inout|interface|invariant|is|lazy|macro|mixin|module|new|nothrow|out|override|package|pragma|private|protected|public|pure|ref|return|scope|shared|static|struct|switch|synchronized|template|throw|try|typeid|typeof|union|unittest|version|while|with|__gshared|__traits|__vector|__parameters'
basic_type: 'bool|byte|cdouble|cent|cfloat|char|creal|dchar|double|float|idouble|ifloat|int|ireal|long|real|short|ubyte|ucent|uint|ulong|ushort|void|wchar|string|dstring|wstring|size_t|ptrdiff_t'
basic_type: 'bool|byte|cdouble|cent|cfloat|char|creal|dchar|double|float|idouble|ifloat|int|ireal|long|real|short|ubyte|ucent|uint|ulong|ushort|void|wchar'
builtin_type_alias: 'string|dstring|wstring|size_t|ptrdiff_t|noreturn'
language_constant: 'null|true|false|__FILE__|__FILE_FULL_PATH__|__MODULE__|__LINE__|__FUNCTION__|__PRETTY_FUNCTION__|__DATE__|__EOF__|__TIME__|__TIMESTAMP__|__VENDOR__|__VERSION__|__ctfe'
language_variable: 'this|super'
reserved: '{{keyword}}|{{basic_type}}|{{language_constant}}|{{language_variable}}'
Expand Down Expand Up @@ -1243,6 +1244,9 @@ contexts:
- match: '\b({{basic_type}})\b'
scope: storage.type.d
set: value-after
- match: '\b({{builtin_type_alias}})\b'
scope: support.type.builtin-alias.d
set: value-after
- match: '\b({{name}})\s*(=>)'
captures:
1: variable.parameter.d
Expand Down Expand Up @@ -2235,15 +2239,19 @@ contexts:
- match: '\b{{name}}\b(?=\s*!)'
scope: meta.function-call.template.d meta.path.d variable.function.d
pop: true
- match: '\b{{builtin_type_alias}}\b'
scope: meta.path.d support.type.builtin-alias.d
set: type-identifier-after
- match: '\b{{name}}\b'
scope: meta.path.d storage.type.d
set:
- match: \.
scope: meta.path.d punctuation.accessor.dot.d
set: type-identifier
- match: '(?=\S)'
pop: true
set: type-identifier-after
- include: not-whitespace-illegal-pop
type-identifier-after:
- match: \.
scope: meta.path.d punctuation.accessor.dot.d
set: type-identifier
- match: '(?=\S)'
pop: true
type-identifier-ref:
- match: \.
scope: meta.path.d punctuation.accessor.dot.d
Expand Down
36 changes: 18 additions & 18 deletions D/tests/syntax_test_d.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ extern(1)
// ^ meta.path.d variable.other.d
// ^ punctuation.terminator.d
string foo = import("foo.txt");
//^^^^^^ storage.type.d
//^^^^^^ support.type.builtin-alias.d
// ^^^ variable.other.d
// ^ keyword.operator.assignment.d
// ^^^^^^ keyword.control.import.d
Expand Down Expand Up @@ -580,7 +580,7 @@ extern(1)
// ^^^^^ storage.modifier.d
// ^^^ storage.type.d
// ^ punctuation.section.brackets.begin.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ punctuation.section.brackets.end.d
// ^ punctuation.separator.sequence.d
// ^^^ entity.name.type.d
Expand All @@ -599,7 +599,7 @@ extern(1)
// ^^^^^ storage.modifier.d
// ^^^ storage.type.d
// ^ punctuation.section.brackets.begin.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ punctuation.section.brackets.end.d
// ^^^^^^^^^ entity.name.type.d
// ^ punctuation.separator.sequence.d
Expand Down Expand Up @@ -649,7 +649,7 @@ extern(1)
foo[string] b = 123;
//^^^ storage.type.d
// ^ punctuation.section.brackets.begin.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ punctuation.section.brackets.end.d
// ^ variable.other.d
// ^ keyword.operator.assignment.d
Expand Down Expand Up @@ -915,7 +915,7 @@ extern(1)
//^^^^^ keyword.declaration.union.d
// ^^^^ entity.name.union.d
// ^ punctuation.section.group.begin.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ variable.parameter.d
// ^ punctuation.separator.sequence.d
// ^ variable.parameter.d
Expand Down Expand Up @@ -996,7 +996,7 @@ extern(1)
// ^ punctuation.separator.mapping.d
// ^^^ storage.type.d
// ^ punctuation.section.brackets.begin.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ punctuation.section.brackets.end.d
// ^ punctuation.section.block.begin.d
// ^^^^ entity.name.constant.d
Expand Down Expand Up @@ -1278,7 +1278,7 @@ extern(1)
int[string] foo() {}
//^^^ storage.type.d
// ^ punctuation.section.brackets.begin.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ punctuation.section.brackets.end.d
// ^^^ meta.function.d entity.name.function.d
// ^^ meta.function.parameters.d
Expand Down Expand Up @@ -1381,7 +1381,7 @@ extern(1)
// ^ variable.parameter.d
// ^^^ keyword.operator.variadic.d
// ^ punctuation.separator.sequence.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ punctuation.section.brackets.begin.d
// ^ punctuation.section.brackets.end.d
// ^ variable.parameter.d
Expand Down Expand Up @@ -1499,7 +1499,7 @@ extern(1)
const(string) foo(T)(ref const(int) a, auto ref T b) {}
//^^^^^ storage.modifier.d
// ^ punctuation.section.group.begin.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ punctuation.section.group.end.d
// ^^^ meta.function.d entity.name.function.d
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.parameters.d
Expand Down Expand Up @@ -1531,7 +1531,7 @@ extern(1)
// ^ keyword.operator.comparison.d
// ^^^ storage.type.d
// ^ punctuation.separator.sequence.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ variable.parameter.d
// ^ keyword.operator.comparison.d
// ^^^ string.quoted.double.d
Expand Down Expand Up @@ -1806,7 +1806,7 @@ extern(1)
//^^^^^^^^ keyword.declaration.template.d
// ^ entity.name.template.d
// ^ punctuation.section.group.begin.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ variable.parameter.d
// ^ punctuation.section.group.end.d
// ^ punctuation.section.block.begin.d
Expand Down Expand Up @@ -2071,7 +2071,7 @@ extern(1)
for (size_t i; !val.empty; val.popFront(), ++i) {}
//^^^ keyword.control.loop.d
// ^ punctuation.section.parens.begin.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ variable.other.d
// ^ punctuation.terminator.d
// ^ keyword.operator.logical.d
Expand Down Expand Up @@ -2288,7 +2288,7 @@ extern(1)
// ^ punctuation.separator.sequence.d
// ^^^^^ string.quoted.double.d
// ^ punctuation.section.parens.end.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ punctuation.section.brackets.begin.d
// ^^ meta.number.integer.decimal.d
// ^ punctuation.section.brackets.end.d
Expand Down Expand Up @@ -2319,7 +2319,7 @@ extern(1)
// ^ punctuation.separator.sequence.d
// ^ meta.number.integer.decimal.d
// ^ punctuation.section.parens.end.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ punctuation.section.brackets.begin.d
// ^^ meta.number.integer.decimal.d
// ^ punctuation.section.brackets.end.d
Expand Down Expand Up @@ -2536,7 +2536,7 @@ extern(1)
// ^ punctuation.terminator.d

string[] f = [
//^^^^^^ storage.type.d
//^^^^^^ support.type.builtin-alias.d
// ^ punctuation.section.brackets.begin.d
// ^ punctuation.section.brackets.end.d
// ^ variable.other.d
Expand Down Expand Up @@ -2901,7 +2901,7 @@ extern(1)
// ^^^ storage.type.d
// ^ variable.parameter.d
// ^ punctuation.separator.sequence.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ variable.parameter.d
// ^ punctuation.section.group.end.d
// ^^^^^^^^^^^ meta.function.d
Expand All @@ -2912,7 +2912,7 @@ extern(1)
function size_t(foo a) {};
//^^^^^^^^^^^^^^^ meta.function.d
//^^^^^^^^ keyword.other.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^^^^^^^ meta.function.parameters.d
// ^ punctuation.section.group.begin.d
// ^^^ storage.type.d
Expand Down Expand Up @@ -3078,7 +3078,7 @@ extern(1)
// ^^^^^^^^^^^ meta.function.d entity.name.function.d
// ^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.parameters.d
// ^ punctuation.section.group.begin.d
// ^^^^^^ storage.type.d
// ^^^^^^ support.type.builtin-alias.d
// ^ variable.parameter.d
// ^ punctuation.separator.sequence.d
// ^ variable.parameter.d
Expand Down
Loading