@@ -98,28 +98,27 @@ pub fn validate_extends(validator: &Validator, turbo_json: &TurboJson) -> Vec<Er
9898 text: NamedSource :: new( path, text) ,
9999 } ] ;
100100 }
101- if let Some ( package_name) = turbo_json. extends . first ( )
102- && package_name != ROOT_PKG_NAME
103- && validator. non_root_extends
104- {
105- let path = turbo_json
106- . path
107- . as_ref ( )
108- . map_or ( "turbo.json" , |p| p. as_ref ( ) ) ;
101+ if let Some ( package_name) = turbo_json. extends . first ( ) {
102+ if package_name != ROOT_PKG_NAME && validator. non_root_extends {
103+ let path = turbo_json
104+ . path
105+ . as_ref ( )
106+ . map_or ( "turbo.json" , |p| p. as_ref ( ) ) ;
109107
110- let ( span, text) = match turbo_json. text {
111- Some ( ref text) => {
112- let len = text. len ( ) ;
113- let span: SourceSpan = ( 0 , len - 1 ) . into ( ) ;
114- ( Some ( span) , text. to_string ( ) )
115- }
116- None => ( None , String :: new ( ) ) ,
117- } ;
118- // Root needs to be first
119- return vec ! [ Error :: ExtendsRootFirst {
120- span,
121- text: NamedSource :: new( path, text) ,
122- } ] ;
108+ let ( span, text) = match turbo_json. text {
109+ Some ( ref text) => {
110+ let len = text. len ( ) ;
111+ let span: SourceSpan = ( 0 , len - 1 ) . into ( ) ;
112+ ( Some ( span) , text. to_string ( ) )
113+ }
114+ None => ( None , String :: new ( ) ) ,
115+ } ;
116+ // Root needs to be first
117+ return vec ! [ Error :: ExtendsRootFirst {
118+ span,
119+ text: NamedSource :: new( path, text) ,
120+ } ] ;
121+ }
123122 }
124123 // If we allow for non-root extends we don't need to perform this check
125124 ( !validator. non_root_extends
0 commit comments