@@ -19,7 +19,6 @@ import {
19
19
NodeTypes
20
20
} from '../utils/message-compiler/utils'
21
21
import { parse } from '../utils/message-compiler/parser'
22
- import { parse as parseForV8 } from '../utils/message-compiler/parser-v8'
23
22
import { traverseNode } from '../utils/message-compiler/traverser'
24
23
import { getFilename , getSourceCode } from '../utils/compat'
25
24
@@ -42,7 +41,7 @@ function create(context: RuleContext): RuleListener {
42
41
const sourceCode = getSourceCode ( context )
43
42
const messageSyntaxVersions = getMessageSyntaxVersions ( context )
44
43
45
- function verifyForNewSyntax (
44
+ function verifySyntax (
46
45
message : string ,
47
46
reportNode : JSONAST . JSONStringLiteral | YAMLAST . YAMLScalar ,
48
47
getReportOffset : GetReportOffset
@@ -83,49 +82,6 @@ function create(context: RuleContext): RuleListener {
83
82
} )
84
83
}
85
84
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
-
129
85
function verifyMessage (
130
86
message : string ,
131
87
reportNode : JSONAST . JSONStringLiteral | YAMLAST . YAMLScalar ,
@@ -134,18 +90,8 @@ function create(context: RuleContext): RuleListener {
134
90
if ( messageSyntaxVersions . reportIfMissingSetting ( ) ) {
135
91
return
136
92
}
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
- }
143
93
144
- if ( newSyntax ) {
145
- verifyForNewSyntax ( message , reportNode , getReportOffset )
146
- } else if ( v8Syntax ) {
147
- verifyForV8 ( message , reportNode , getReportOffset )
148
- }
94
+ verifySyntax ( message , reportNode , getReportOffset )
149
95
}
150
96
151
97
const createVisitorForJson = defineCreateVisitorForJson ( verifyMessage )
0 commit comments