haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(dotnet): Don't treat folder with .sln file as a .NET project (#2785) 

* Don't treat folder with .sln file as a .NET project

* Update docs for .NET detect_extensions changes
This commit is contained in:
Rumia 2021-06-05 22:18:34 +08:00 committed by GitHub
parent 14a2ada1ee
commit 5edaa90d67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/config/README.md
View File

@ -839,7 +839,6 @@ the following files are present in the current directory:
- `Directory.Build.props` - `Directory.Build.props`
- `Directory.Build.targets` - `Directory.Build.targets`
- `Packages.props` - `Packages.props`
- `*.sln`
- `*.csproj` - `*.csproj`
- `*.fsproj` - `*.fsproj`
- `*.xproj` - `*.xproj`
@ -863,7 +862,7 @@ when there is a csproj file in the current directory.
| `version_format` | `"v${raw}"` | The version format. Available vars are `raw`, `major`, `minor`, & `patch` | | `version_format` | `"v${raw}"` | The version format. Available vars are `raw`, `major`, `minor`, & `patch` |
| `symbol` | `".NET "` | The symbol used before displaying the version of dotnet. | | `symbol` | `".NET "` | The symbol used before displaying the version of dotnet. |
| `heuristic` | `true` | Use faster version detection to keep starship snappy. | | `heuristic` | `true` | Use faster version detection to keep starship snappy. |
| `detect_extensions` | `["sln", "csproj", "fsproj", "xproj"]` | Which extensions should trigger this module. | | `detect_extensions` | `["csproj", "fsproj", "xproj"]` | Which extensions should trigger this module. |
| `detect_files` | `["global.json", "project.json", "Directory.Build.props", "Directory.Build.targets", "Packages.props"]` | Which filenames should trigger this module. | | `detect_files` | `["global.json", "project.json", "Directory.Build.props", "Directory.Build.targets", "Packages.props"]` | Which filenames should trigger this module. |
| `detect_folders` | `[]` | Which folders should trigger this modules. | | `detect_folders` | `[]` | Which folders should trigger this modules. |
| `style` | `"bold blue"` | The style for the module. | | `style` | `"bold blue"` | The style for the module. |

2
src/configs/dotnet.rs
View File

@ -25,7 +25,7 @@ impl<'a> Default for DotnetConfig<'a> {
style: "blue bold", style: "blue bold",
heuristic: true, heuristic: true,
disabled: false, disabled: false,
detect_extensions: vec!["sln", "csproj", "fsproj", "xproj"], detect_extensions: vec!["csproj", "fsproj", "xproj"],
detect_files: vec![ detect_files: vec![
"global.json", "global.json",
"project.json", "project.json",

5
src/modules/dotnet.rs
View File

@ -395,10 +395,7 @@ mod tests {
fn shows_latest_in_directory_with_solution() -> io::Result<()> { fn shows_latest_in_directory_with_solution() -> io::Result<()> {
let workspace = create_workspace(false)?; let workspace = create_workspace(false)?;
touch_path(&workspace, "solution.sln", None)?; touch_path(&workspace, "solution.sln", None)?;
expect_output( expect_output(&workspace.path(), None);
&workspace.path(),
Some(format!("{}", Color::Blue.bold().paint(".NET v3.1.103 "))),
);
workspace.close() workspace.close()
} }