Skip to content

Commit c691a47

Browse files
Fix generator which was broken
1 parent e1458f2 commit c691a47

99 files changed

Lines changed: 2195 additions & 2023 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 1 addition & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -24,155 +24,4 @@ indent_size = 2
2424
indent_size = 2
2525

2626
[*.md]
27-
trim_trailing_whitespace = false
28-
29-
[*.cs]
30-
# Prefer file scoped namespace declarations
31-
csharp_style_namespace_declarations = file_scoped:warning
32-
33-
# Sort using and Import directives with System.* appearing first
34-
dotnet_sort_system_directives_first = true
35-
dotnet_separate_import_directive_groups = false
36-
37-
# Avoid "this." and "Me." if not necessary
38-
dotnet_style_qualification_for_field = false:refactoring
39-
dotnet_style_qualification_for_property = false:refactoring
40-
dotnet_style_qualification_for_method = false:refactoring
41-
dotnet_style_qualification_for_event = false:refactoring
42-
43-
# Use language keywords instead of framework type names for type references
44-
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
45-
dotnet_style_predefined_type_for_member_access = true:suggestion
46-
47-
# Suggest more modern language features when available
48-
dotnet_style_object_initializer = true:suggestion
49-
dotnet_style_collection_initializer = true:suggestion
50-
dotnet_style_coalesce_expression = true:suggestion
51-
dotnet_style_null_propagation = true:suggestion
52-
dotnet_style_explicit_tuple_names = true:suggestion
53-
54-
# Non-private static fields are PascalCase
55-
dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.severity = suggestion
56-
dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.symbols = non_private_static_fields
57-
dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.style = non_private_static_field_style
58-
dotnet_naming_symbols.non_private_static_fields.applicable_kinds = field
59-
dotnet_naming_symbols.non_private_static_fields.applicable_accessibilities = public, protected, internal, protected_internal, private_protected
60-
dotnet_naming_symbols.non_private_static_fields.required_modifiers = static
61-
dotnet_naming_style.non_private_static_field_style.capitalization = pascal_case
62-
63-
# Non-private readonly fields are PascalCase
64-
dotnet_naming_rule.non_private_readonly_fields_should_be_pascal_case.severity = suggestion
65-
dotnet_naming_rule.non_private_readonly_fields_should_be_pascal_case.symbols = non_private_readonly_fields
66-
dotnet_naming_rule.non_private_readonly_fields_should_be_pascal_case.style = non_private_readonly_field_style
67-
dotnet_naming_symbols.non_private_readonly_fields.applicable_kinds = field
68-
dotnet_naming_symbols.non_private_readonly_fields.applicable_accessibilities = public, protected, internal, protected_internal, private_protected
69-
dotnet_naming_symbols.non_private_readonly_fields.required_modifiers = readonly
70-
dotnet_naming_style.non_private_readonly_field_style.capitalization = pascal_case
71-
72-
# Constants are PascalCase
73-
dotnet_naming_rule.constants_should_be_pascal_case.severity = suggestion
74-
dotnet_naming_rule.constants_should_be_pascal_case.symbols = constants
75-
dotnet_naming_rule.constants_should_be_pascal_case.style = constant_style
76-
dotnet_naming_symbols.constants.applicable_kinds = field, local
77-
dotnet_naming_symbols.constants.required_modifiers = const
78-
dotnet_naming_style.constant_style.capitalization = pascal_case
79-
80-
# Instance fields are camelCase and start with _
81-
dotnet_naming_rule.instance_fields_should_be_camel_case.severity = suggestion
82-
dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields
83-
dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_style
84-
dotnet_naming_symbols.instance_fields.applicable_kinds = field
85-
dotnet_naming_style.instance_field_style.capitalization = camel_case
86-
dotnet_naming_style.instance_field_style.required_prefix = _
87-
88-
# Locals and parameters are camelCase
89-
dotnet_naming_rule.locals_should_be_camel_case.severity = suggestion
90-
dotnet_naming_rule.locals_should_be_camel_case.symbols = locals_and_parameters
91-
dotnet_naming_rule.locals_should_be_camel_case.style = camel_case_style
92-
dotnet_naming_symbols.locals_and_parameters.applicable_kinds = parameter, local
93-
dotnet_naming_style.camel_case_style.capitalization = camel_case
94-
95-
# Local functions are PascalCase
96-
dotnet_naming_rule.local_functions_should_be_pascal_case.severity = suggestion
97-
dotnet_naming_rule.local_functions_should_be_pascal_case.symbols = local_functions
98-
dotnet_naming_rule.local_functions_should_be_pascal_case.style = local_function_style
99-
dotnet_naming_symbols.local_functions.applicable_kinds = local_function
100-
dotnet_naming_style.local_function_style.capitalization = pascal_case
101-
102-
# By default, name items with PascalCase
103-
dotnet_naming_rule.members_should_be_pascal_case.severity = suggestion
104-
dotnet_naming_rule.members_should_be_pascal_case.symbols = all_members
105-
dotnet_naming_rule.members_should_be_pascal_case.style = pascal_case_style
106-
dotnet_naming_symbols.all_members.applicable_kinds = *
107-
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
108-
109-
# Newline settings
110-
csharp_new_line_before_open_brace = all
111-
csharp_new_line_before_else = true
112-
csharp_new_line_before_catch = true
113-
csharp_new_line_before_finally = true
114-
csharp_new_line_before_members_in_object_initializers = true
115-
csharp_new_line_before_members_in_anonymous_types = true
116-
csharp_new_line_between_query_expression_clauses = true
117-
118-
# Indentation preferences
119-
csharp_indent_block_contents = true
120-
csharp_indent_braces = false
121-
csharp_indent_case_contents = true
122-
csharp_indent_case_contents_when_block = true
123-
csharp_indent_switch_labels = true
124-
csharp_indent_labels = flush_left
125-
126-
# Prefer "var" everywhere
127-
csharp_style_var_for_built_in_types = true:suggestion
128-
csharp_style_var_when_type_is_apparent = true:suggestion
129-
csharp_style_var_elsewhere = true:suggestion
130-
131-
# Prefer method-like constructs to have a block body
132-
csharp_style_expression_bodied_methods = false:none
133-
csharp_style_expression_bodied_constructors = false:none
134-
csharp_style_expression_bodied_operators = false:none
135-
136-
# Prefer property-like constructs to have an expression-body
137-
csharp_style_expression_bodied_properties = true:none
138-
csharp_style_expression_bodied_indexers = true:none
139-
csharp_style_expression_bodied_accessors = true:none
140-
141-
# Suggest more modern language features when available
142-
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
143-
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
144-
csharp_style_inlined_variable_declaration = true:suggestion
145-
csharp_style_throw_expression = true:suggestion
146-
csharp_style_conditional_delegate_call = true:suggestion
147-
148-
# Space preferences
149-
csharp_space_after_cast = false
150-
csharp_space_after_colon_in_inheritance_clause = true
151-
csharp_space_after_comma = true
152-
csharp_space_after_dot = false
153-
csharp_space_after_keywords_in_control_flow_statements = true
154-
csharp_space_after_semicolon_in_for_statement = true
155-
csharp_space_around_binary_operators = before_and_after
156-
csharp_space_around_declaration_statements = do_not_ignore
157-
csharp_space_before_colon_in_inheritance_clause = true
158-
csharp_space_before_comma = false
159-
csharp_space_before_dot = false
160-
csharp_space_before_open_square_brackets = false
161-
csharp_space_before_semicolon_in_for_statement = false
162-
csharp_space_between_empty_square_brackets = false
163-
csharp_space_between_method_call_empty_parameter_list_parentheses = false
164-
csharp_space_between_method_call_name_and_opening_parenthesis = false
165-
csharp_space_between_method_call_parameter_list_parentheses = false
166-
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
167-
csharp_space_between_method_declaration_name_and_open_parenthesis = false
168-
csharp_space_between_method_declaration_parameter_list_parentheses = false
169-
csharp_space_between_parentheses = false
170-
csharp_space_between_square_brackets = false
171-
172-
# Blocks are allowed
173-
csharp_prefer_braces = true:silent
174-
csharp_preserve_single_line_blocks = true
175-
csharp_preserve_single_line_statements = true
176-
177-
# warning RS0037: PublicAPI.txt is missing '#nullable enable'
178-
dotnet_diagnostic.RS0037.severity = none
27+
trim_trailing_whitespace = false

build.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,6 @@
3333
.IsDependentOn("Lint")
3434
.Does(ctx =>
3535
{
36-
Information("Compiling generator...");
37-
ctx.DotNetBuild(generatorSolution, new DotNetBuildSettings
38-
{
39-
Configuration = configuration,
40-
Verbosity = DotNetVerbosity.Minimal,
41-
NoLogo = true,
42-
NoIncremental = ctx.HasArgument("rebuild"),
43-
MSBuildSettings = new DotNetMSBuildSettings()
44-
.TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error)
45-
});
46-
47-
Information("\nCompiling Spectre.Console...");
4836
ctx.DotNetBuild(solution, new DotNetBuildSettings
4937
{
5038
Configuration = configuration,

resources/scripts/Generate-Colors.ps1

100644100755
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1+
#!/usr/local/bin/pwsh
2+
13
##########################################################
24
# Script that generates known colors and lookup tables.
35
##########################################################
46

57
$Output = Join-Path $PSScriptRoot "Temp"
8+
$Generator = Join-Path $PSScriptRoot "/../../src/Generator"
69
$Source = Join-Path $PSScriptRoot "/../../src/Spectre.Console"
710

811
if(!(Test-Path $Output -PathType Container)) {
912
New-Item -ItemType Directory -Path $Output | Out-Null
1013
}
1114

1215
# Generate the files
13-
Push-Location Generator
16+
Push-Location $Generator
1417
&dotnet run -- colors "$Output"
1518
if(!$?) {
1619
Pop-Location

resources/scripts/Generate-Emoji.ps1

100644100755
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
#!/usr/local/bin/pwsh
2+
13
##########################################################
24
# Script that generates the emoji lookup table.
35
##########################################################
46

57
$Output = Join-Path $PSScriptRoot "Temp"
8+
$Generator = Join-Path $PSScriptRoot "/../../src/Generator"
69
$Source = Join-Path $PSScriptRoot "/../../src/Spectre.Console"
710
$Docs = Join-Path $PSScriptRoot "/../../docs/src/Data"
811

@@ -11,7 +14,7 @@ if(!(Test-Path $Output -PathType Container)) {
1114
}
1215

1316
# Generate the files
14-
Push-Location Generator
17+
Push-Location $Generator
1518
&dotnet run -- emoji "$Output" --input $Output
1619
if(!$?) {
1720
Pop-Location

resources/scripts/Generate-Samples.ps1

100644100755
Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
1+
#!/usr/local/bin/pwsh
2+
3+
[CmdletBinding(PositionalBinding=$false)]
4+
Param(
5+
[Parameter(ValueFromRemainingArguments)]
6+
[string[]]$Remaining
7+
)
8+
19
# first arg is either the name of a single sample you want to run or leave
210
# blank if you want to run them all. the samples aren't going to run at the same
311
# speed each time so if you run all of them you'll have everything as a change
412
# for your commit so use this sparingly.
513

14+
$Generator = Join-Path $PSScriptRoot "/../../src/Generator"
15+
$Output = Join-Path $PSScriptRoot "../../docs/input/assets/casts"
16+
617
# Generate the files
7-
Push-Location Generator
8-
dotnet run -- samples -o "../../../docs/input/assets/casts" $args[0]
18+
Push-Location $Generator
19+
&dotnet run -- samples -o "$Output" $Remaining
920
if(!$?) {
1021
Pop-Location
1122
Throw "An error occured when generating code."

resources/scripts/Generate-Spinners.ps1

100644100755
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1+
#!/usr/local/bin/pwsh
2+
13
##########################################################
24
# Script that generates progress spinners.
35
##########################################################
46

57
$Output = Join-Path $PSScriptRoot "Temp"
8+
$Generator = Join-Path $PSScriptRoot "/../../src/Generator"
69
$Source = Join-Path $PSScriptRoot "/../../src/Spectre.Console"
710

811
if(!(Test-Path $Output -PathType Container)) {
912
New-Item -ItemType Directory -Path $Output | Out-Null
1013
}
1114

1215
# Generate the files
13-
Push-Location Generator
14-
&dotnet run -- spinners "$Output" --input $Output
16+
Push-Location $Generator
17+
&dotnet run -- spinners "$Output"
1518
if(!$?) {
1619
Pop-Location
1720
Throw "An error occured when generating code."

resources/scripts/Generator/Commands/AsciiCast/AnsiConsoleExtensions.cs

Lines changed: 0 additions & 33 deletions
This file was deleted.

resources/scripts/Generator/Commands/AsciiCast/AsciiCastConsole.cs

Lines changed: 0 additions & 40 deletions
This file was deleted.

resources/scripts/Generator/Commands/AsciiCast/AsciiCastExtensions.cs

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)