Skip to content

Commit f78c212

Browse files
committed
Merge remote-tracking branch 'origin/dev' into search-open-explorer-window-tweaks
# Conflicts: # Flow.Launcher/ViewModel/MainViewModel.cs
2 parents 0a062c3 + b338494 commit f78c212

File tree

477 files changed

+52306
-34257
lines changed

Some content is hidden

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

477 files changed

+52306
-34257
lines changed

.editorconfig

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
2+
###############################
3+
# Core EditorConfig Options #
4+
###############################
5+
# All files
6+
[*]
7+
indent_style = space
8+
9+
# XML project files
10+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
11+
indent_size = 2
12+
13+
# XML config files
14+
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
15+
indent_size = 2
16+
17+
# Code files
18+
[*.{cs,csx,vb,vbx}]
19+
indent_size = 4
20+
insert_final_newline = true
21+
charset = utf-8-bom
22+
###############################
23+
# .NET Coding Conventions #
24+
###############################
25+
[*.{cs,vb}]
26+
# Organize usings
27+
dotnet_sort_system_directives_first = true
28+
# this. preferences
29+
dotnet_style_qualification_for_field = false:silent
30+
dotnet_style_qualification_for_property = false:silent
31+
dotnet_style_qualification_for_method = false:silent
32+
dotnet_style_qualification_for_event = false:silent
33+
# Language keywords vs BCL types preferences
34+
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
35+
dotnet_style_predefined_type_for_member_access = true:silent
36+
# Parentheses preferences
37+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
38+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
39+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
40+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
41+
# Modifier preferences
42+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
43+
dotnet_style_readonly_field = true:suggestion
44+
# Expression-level preferences
45+
dotnet_style_object_initializer = true:suggestion
46+
dotnet_style_collection_initializer = true:suggestion
47+
dotnet_style_explicit_tuple_names = true:suggestion
48+
dotnet_style_null_propagation = true:suggestion
49+
dotnet_style_coalesce_expression = true:suggestion
50+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
51+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
52+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
53+
dotnet_style_prefer_auto_properties = true:silent
54+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
55+
dotnet_style_prefer_conditional_expression_over_return = true:silent
56+
###############################
57+
# Naming Conventions #
58+
###############################
59+
# Style Definitions
60+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
61+
# Use PascalCase for constant fields
62+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
63+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
64+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
65+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
66+
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
67+
dotnet_naming_symbols.constant_fields.required_modifiers = const
68+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
69+
tab_width = 2
70+
end_of_line = crlf
71+
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
72+
dotnet_style_prefer_compound_assignment = true:suggestion
73+
dotnet_diagnostic.CA1416.severity = silent
74+
###############################
75+
# C# Coding Conventions #
76+
###############################
77+
[*.cs]
78+
dotnet_diagnostics.VSTHRD200.severity = none # VSTHRD200: Use "Async" suffix for async methods
79+
dotnet_analyzer_diagnostic.VSTHRD200.severity = none # VSTHRD200: Use "Async" suffix for async methods
80+
# var preferences
81+
csharp_style_var_for_built_in_types = true:silent
82+
csharp_style_var_when_type_is_apparent = true:silent
83+
csharp_style_var_elsewhere = true:silent
84+
# Expression-bodied members
85+
csharp_style_expression_bodied_methods = false:silent
86+
csharp_style_expression_bodied_constructors = false:silent
87+
csharp_style_expression_bodied_operators = false:silent
88+
csharp_style_expression_bodied_properties = true:silent
89+
csharp_style_expression_bodied_indexers = true:silent
90+
csharp_style_expression_bodied_accessors = true:silent
91+
# Pattern matching preferences
92+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
93+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
94+
# Null-checking preferences
95+
csharp_style_throw_expression = true:suggestion
96+
csharp_style_conditional_delegate_call = true:suggestion
97+
# Modifier preferences
98+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
99+
# Expression-level preferences
100+
csharp_prefer_braces = true:silent
101+
csharp_style_deconstructed_variable_declaration = true:suggestion
102+
csharp_prefer_simple_default_expression = true:suggestion
103+
csharp_style_pattern_local_over_anonymous_function = true:suggestion
104+
csharp_style_inlined_variable_declaration = true:suggestion
105+
###############################
106+
# C# Formatting Rules #
107+
###############################
108+
# New line preferences
109+
csharp_new_line_before_open_brace = all
110+
csharp_new_line_before_else = true
111+
csharp_new_line_before_catch = true
112+
csharp_new_line_before_finally = true
113+
csharp_new_line_before_members_in_object_initializers = true
114+
csharp_new_line_before_members_in_anonymous_types = true
115+
csharp_new_line_between_query_expression_clauses = true
116+
# Indentation preferences
117+
csharp_indent_case_contents = true
118+
csharp_indent_switch_labels = true
119+
csharp_indent_labels = flush_left
120+
# Space preferences
121+
csharp_space_after_cast = false
122+
csharp_space_after_keywords_in_control_flow_statements = true
123+
csharp_space_between_method_call_parameter_list_parentheses = false
124+
csharp_space_between_method_declaration_parameter_list_parentheses = false
125+
csharp_space_between_parentheses = false
126+
csharp_space_before_colon_in_inheritance_clause = true
127+
csharp_space_after_colon_in_inheritance_clause = true
128+
csharp_space_around_binary_operators = before_and_after
129+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
130+
csharp_space_between_method_call_name_and_opening_parenthesis = false
131+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
132+
# Wrapping preferences
133+
csharp_preserve_single_line_statements = true
134+
csharp_preserve_single_line_blocks = true
135+
csharp_using_directive_placement = outside_namespace:silent
136+
csharp_prefer_simple_using_statement = true:suggestion
137+
csharp_style_namespace_declarations = block_scoped:silent
138+
csharp_style_prefer_method_group_conversion = true:silent
139+
csharp_style_expression_bodied_lambdas = true:silent
140+
csharp_style_expression_bodied_local_functions = false:silent
141+
###############################
142+
# VB Coding Conventions #
143+
###############################
144+
[*.vb]
145+
# Modifier preferences
146+
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: "\U0001F41E Bug Report"
2+
description: Create a bug report to help us improve Flow Launcher
3+
title: "BUG: "
4+
labels: ["bug"]
5+
6+
body:
7+
- type: markdown
8+
attributes:
9+
value: Thanks for taking the time to fill out this bug report!
10+
11+
- type: checkboxes
12+
attributes:
13+
label: Checks
14+
options:
15+
- label: >
16+
I have checked that this issue has not already been reported.
17+
18+
- type: textarea
19+
attributes:
20+
label: Problem Description
21+
description: A clear and concise description of what the problem is.
22+
validations:
23+
required: true
24+
25+
- type: textarea
26+
attributes:
27+
label: To Reproduce
28+
description: Steps to reproduce the behavior.
29+
value: >
30+
1. ...
31+
32+
2. ...
33+
34+
3. ...
35+
36+
- type: textarea
37+
attributes:
38+
label: Screenshots
39+
description: If applicable, add screenshots to help explain your problem.
40+
41+
- type: input
42+
attributes:
43+
label: Flow Launcher Version
44+
description: Go to "Settings" => "About".
45+
value: v1.8.3
46+
47+
- type: input
48+
attributes:
49+
label: Windows Build Number
50+
description: Run "ver" at CMD (command prompt).
51+
value: 10.0.19043.1288
52+
53+
- type: textarea
54+
id: logs
55+
attributes:
56+
label: Error Log
57+
description: >
58+
Log file place:
59+
60+
- The latest version place: `%AppData%\FlowLauncher\Logs\<version>\<date>.txt`
61+
62+
- For portable mode: `%LocalAppData%\FlowLauncher\<App-Version>\UserData\Logs\<version>\<date>.txt`
63+
value: >
64+
<details>
65+
66+
67+
```shell
68+
69+
70+
Replace this line with the important log contents.
71+
72+
73+
```
74+
75+
</details>
76+
77+
78+
<!-- # Or drag and drop the log file and delete the above detail part. -->

.github/actions/spelling/README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# check-spelling/check-spelling configuration
2+
3+
File | Purpose | Format | Info
4+
-|-|-|-
5+
[dictionary.txt](dictionary.txt) | Replacement dictionary (creating this file will override the default dictionary) | one word per line | [dictionary](https://github.com/check-spelling/check-spelling/wiki/Configuration#dictionary)
6+
[allow.txt](allow.txt) | Add words to the dictionary | one word per line (only letters and `'`s allowed) | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)
7+
[reject.txt](reject.txt) | Remove words from the dictionary (after allow) | grep pattern matching whole dictionary words | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)
8+
[excludes.txt](excludes.txt) | Files to ignore entirely | perl regular expression | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes)
9+
[only.txt](only.txt) | Only check matching files (applied after excludes) | perl regular expression | [only](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-only)
10+
[patterns.txt](patterns.txt) | Patterns to ignore from checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
11+
[candidate.patterns](candidate.patterns) | Patterns that might be worth adding to [patterns.txt](patterns.txt) | perl regular expression with optional comment block introductions (all matches will be suggested) | [candidates](https://github.com/check-spelling/check-spelling/wiki/Feature:-Suggest-patterns)
12+
[line_forbidden.patterns](line_forbidden.patterns) | Patterns to flag in checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
13+
[expect.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)
14+
[advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
15+
16+
Note: you can replace any of these files with a directory by the same name (minus the suffix)
17+
and then include multiple files inside that directory (with that suffix) to merge multiple files together.

.github/actions/spelling/advice.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
2+
<details><summary>If the flagged items are :exploding_head: false positives</summary>
3+
4+
If items relate to a ...
5+
* binary file (or some other file you wouldn't want to check at all).
6+
7+
Please add a file path to the `excludes.txt` file matching the containing file.
8+
9+
File paths are Perl 5 Regular Expressions - you can [test](
10+
https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
11+
12+
`^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
13+
../tree/HEAD/README.md) (on whichever branch you're using).
14+
15+
* well-formed pattern.
16+
17+
If you can write a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it,
18+
try adding it to the `patterns.txt` file.
19+
20+
Patterns are Perl 5 Regular Expressions - you can [test](
21+
https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
22+
23+
Note that patterns can't match multiline strings.
24+
25+
</details>

.github/actions/spelling/allow.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
github
2+
https
3+
ssh
4+
ubuntu

0 commit comments

Comments
 (0)