Skip to content

Commit d03396d

Browse files
committed
fix errors in diagnostics
1 parent d9099fb commit d03396d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/diagnostic.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ function ruleConflictCheck(ast: ProgramStatement, filePath: string): Diagnostic[
6161

6262
ast.body.forEach(stmt => {
6363
if (statementIsA(stmt, NodeType.Rule)) {
64-
const dictRule = dictionary.Rules.find(r => r.name === stmt.rule);
64+
const dictRule = dictionary.Rules.find(r => r.name === stmt.rule.value);
6565

6666
ast.body.filter(r => statementIsA(r, NodeType.Rule)).filter(r => r.range !== stmt.range).map(r => r as RuleStatement).forEach(otherRules => {
67-
if (dictRule.conflicts.includes(otherRules.rule)) items.push({
67+
if (dictRule.conflicts.includes(otherRules.rule.value)) items.push({
6868
message: `Rule '${otherRules.rule}' conflicts with '${stmt.rule}', Both of them should not be defined.`,
6969
range: subRange(otherRules.range),
7070
severity: DiagnosticSeverity.Warning,
@@ -148,7 +148,7 @@ function importedExistentCheck(ast: ProgramStatement, filePath: string): Diagnos
148148
ast.body.filter(r => statementIsA(r, NodeType.Import)).map(r => r as ImportStatement).forEach(stmt => {
149149

150150
const filePathButPath = fileURLToPath(filePath);
151-
const fullPath = join(filePathButPath, '../', stmt.path);
151+
const fullPath = join(filePathButPath, '../', stmt.path.value);
152152
if (!existsSync(fullPath)) items.push({
153153
message: `Can't find file '${fullPath}' imported from '${filePathButPath}'`,
154154
severity: DiagnosticSeverity.Error,

0 commit comments

Comments
 (0)