@@ -19,7 +19,6 @@ import {
1919 NodeTypes
2020} from '../utils/message-compiler/utils'
2121import { parse } from '../utils/message-compiler/parser'
22- import { parse as parseForV8 } from '../utils/message-compiler/parser-v8'
2322import { traverseNode } from '../utils/message-compiler/traverser'
2423import { getFilename , getSourceCode } from '../utils/compat'
2524
@@ -42,7 +41,7 @@ function create(context: RuleContext): RuleListener {
4241 const sourceCode = getSourceCode ( context )
4342 const messageSyntaxVersions = getMessageSyntaxVersions ( context )
4443
45- function verifyForNewSyntax (
44+ function verifySyntax (
4645 message : string ,
4746 reportNode : JSONAST . JSONStringLiteral | YAMLAST . YAMLScalar ,
4847 getReportOffset : GetReportOffset
@@ -83,49 +82,6 @@ function create(context: RuleContext): RuleListener {
8382 } )
8483 }
8584
86- function verifyForV8 (
87- message : string ,
88- reportNode : JSONAST . JSONStringLiteral | YAMLAST . YAMLScalar ,
89- getReportOffset : GetReportOffset
90- ) {
91- const { ast, errors } = parseForV8 ( message )
92- if ( errors . length ) {
93- return
94- }
95- traverseNode ( ast , node => {
96- if ( node . type !== NodeTypes . LinkedKey ) {
97- return
98- }
99- if ( message [ node . loc ! . start . offset - 1 ] === '(' ) {
100- return
101- }
102- let range : [ number , number ] | null = null
103- const start = getReportOffset ( node . loc ! . start . offset )
104- const end = getReportOffset ( node . loc ! . end . offset )
105- if ( start != null && end != null ) {
106- range = [ start , end ]
107- }
108- context . report ( {
109- loc : range
110- ? {
111- start : sourceCode . getLocFromIndex ( range [ 0 ] ) ,
112- end : sourceCode . getLocFromIndex ( range [ 1 ] )
113- }
114- : reportNode . loc ,
115- message : 'The linked message key must be enclosed in parentheses.' ,
116- fix ( fixer ) {
117- if ( ! range ) {
118- return null
119- }
120- return [
121- fixer . insertTextBeforeRange ( range , '(' ) ,
122- fixer . insertTextAfterRange ( range , ')' )
123- ]
124- }
125- } )
126- } )
127- }
128-
12985 function verifyMessage (
13086 message : string ,
13187 reportNode : JSONAST . JSONStringLiteral | YAMLAST . YAMLScalar ,
@@ -134,18 +90,8 @@ function create(context: RuleContext): RuleListener {
13490 if ( messageSyntaxVersions . reportIfMissingSetting ( ) ) {
13591 return
13692 }
137- const newSyntax = messageSyntaxVersions . v9 || messageSyntaxVersions . v10
138- const v8Syntax = messageSyntaxVersions . v8
139- if ( newSyntax && v8Syntax ) {
140- // This rule cannot support two versions in the same project.
141- return
142- }
14393
144- if ( newSyntax ) {
145- verifyForNewSyntax ( message , reportNode , getReportOffset )
146- } else if ( v8Syntax ) {
147- verifyForV8 ( message , reportNode , getReportOffset )
148- }
94+ verifySyntax ( message , reportNode , getReportOffset )
14995 }
15096
15197 const createVisitorForJson = defineCreateVisitorForJson ( verifyMessage )
0 commit comments