mirror of
https://github.com/starship/starship.git
synced 2025-06-27 13:22:22 +02:00
suppress Nodejs if Deno files are present (#2627)
This commit is contained in:
parent
2f80d03221
commit
c1394fd7b3
@ -3,6 +3,9 @@ use super::{Context, Module, ModuleConfig};
|
|||||||
use crate::configs::nodejs::NodejsConfig;
|
use crate::configs::nodejs::NodejsConfig;
|
||||||
use crate::formatter::{StringFormatter, VersionFormatter};
|
use crate::formatter::{StringFormatter, VersionFormatter};
|
||||||
|
|
||||||
|
// we shouldn't fire if any of Deno's files are present
|
||||||
|
use crate::configs::deno::DenoConfig;
|
||||||
|
|
||||||
use once_cell::sync::Lazy;
|
use once_cell::sync::Lazy;
|
||||||
use regex::Regex;
|
use regex::Regex;
|
||||||
use semver::Version;
|
use semver::Version;
|
||||||
@ -14,6 +17,8 @@ use std::ops::Deref;
|
|||||||
pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
|
pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
|
||||||
let mut module = context.new_module("nodejs");
|
let mut module = context.new_module("nodejs");
|
||||||
let config = NodejsConfig::try_load(module.config);
|
let config = NodejsConfig::try_load(module.config);
|
||||||
|
let deno_config = DenoConfig::default();
|
||||||
|
|
||||||
let is_js_project = context
|
let is_js_project = context
|
||||||
.try_begin_scan()?
|
.try_begin_scan()?
|
||||||
.set_files(&config.detect_files)
|
.set_files(&config.detect_files)
|
||||||
@ -21,12 +26,17 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
|
|||||||
.set_folders(&config.detect_folders)
|
.set_folders(&config.detect_folders)
|
||||||
.is_match();
|
.is_match();
|
||||||
|
|
||||||
|
let is_deno_project = context
|
||||||
|
.try_begin_scan()?
|
||||||
|
.set_files(&deno_config.detect_files)
|
||||||
|
.is_match();
|
||||||
|
|
||||||
let is_esy_project = context
|
let is_esy_project = context
|
||||||
.try_begin_scan()?
|
.try_begin_scan()?
|
||||||
.set_folders(&["esy.lock"])
|
.set_folders(&["esy.lock"])
|
||||||
.is_match();
|
.is_match();
|
||||||
|
|
||||||
if !is_js_project || is_esy_project {
|
if is_deno_project || !is_js_project || is_esy_project {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -131,6 +141,17 @@ mod tests {
|
|||||||
dir.close()
|
dir.close()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn folder_with_deno_files() -> io::Result<()> {
|
||||||
|
let dir = tempfile::tempdir()?;
|
||||||
|
File::create(dir.path().join("deno.json"))?.sync_all()?;
|
||||||
|
|
||||||
|
let actual = ModuleRenderer::new("nodejs").path(dir.path()).collect();
|
||||||
|
let expected = None;
|
||||||
|
assert_eq!(expected, actual);
|
||||||
|
dir.close()
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn folder_with_package_json() -> io::Result<()> {
|
fn folder_with_package_json() -> io::Result<()> {
|
||||||
let dir = tempfile::tempdir()?;
|
let dir = tempfile::tempdir()?;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user