Skip to content

Commit 64916be

Browse files
fix(grammar-location): fix grammar location path result
1 parent 0b6185e commit 64916be

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

source/test/grammar-location.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ test('should return grammar location if definition is a `GrammarDefinition`', (t
7474
file: 'jsregexp.tmLanguage'
7575
}
7676
}),
77-
'javascript/jsregexp.tmLanguage'
77+
'javascript/syntaxes/jsregexp.tmLanguage'
7878
);
7979
});
8080

@@ -89,7 +89,7 @@ test('should return grammar location if definition is a `LanguageDefinition` wit
8989
file: 'sass.tmLanguage.json'
9090
}
9191
}),
92-
'scss/sass.tmLanguage.json'
92+
'scss/syntaxes/sass.tmLanguage.json'
9393
);
9494
});
9595

@@ -101,6 +101,6 @@ test('should return grammar location if definition is a `LanguageDefinition` wit
101101
extensions: ['.scss'],
102102
grammar: 'scss.tmLanguage.json'
103103
}),
104-
'scss/scss.tmLanguage.json'
104+
'scss/syntaxes/scss.tmLanguage.json'
105105
);
106106
});

source/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ export const getGrammarLocation = (definition: GrammarDefinition | LanguageDefin
3636

3737
if (isLanguageDefinition(definition) && typeof definition.grammar === 'string') {
3838
// The grammar will only be a `string` in case of a language definition.
39-
return path.join(definition.language, definition.grammar);
39+
return path.join(definition.language, 'syntaxes', definition.grammar);
4040
}
4141

4242
// If the `grammar` is not a `string`, it has to be an object.
4343
verifyDefinitionLocation('grammar', definition.grammar);
4444

45-
return path.join(definition.grammar.base, definition.grammar.file);
45+
return path.join(definition.grammar.base, 'syntaxes', definition.grammar.file);
4646
};
4747

4848
/**

0 commit comments

Comments
 (0)