Commit ffbfb36
* Add Lucene1001 / Lucene1002 analyzers for TokenStream contract (#1146)
Adds two new public Roslyn analyzers (C# + VB) that surface the
TokenStream subclassing rules at compile time as warnings instead of
runtime exceptions:
- Lucene1001: an override of End()/Reset()/Close() on a TokenStream
subclass must call the corresponding base method.
- Lucene1002: a non-abstract Tokenizer subclass must override End()
(passes if any class in the hierarchy between the subclass and
Tokenizer already provides the override).
Both analyzers ship with code fix providers. The primary audience is
consumers of the library who write their own TokenStream-derived
types — Lucene.NET's in-tree TokenStream subclasses intentionally
match the upstream Java behavior, which itself does not always call
super.X() in End/Reset/Close. Each in-tree violation is therefore
suppressed with [SuppressMessage] and a "LUCENENET specific" comment
that explains why it matches the Java parent. Two End() overrides
(PrefixAwareTokenFilter, PrefixAndSuffixAwareTokenFilter) carry an
additional "LUCENENET TODO" because the upstream Java omission of
super.end() may be a latent bug worth revisiting.
The test verifier helper now references System.Runtime so analyzer
fixes that introduce base calls returning void don't trigger a
spurious CS0012 in the post-fix compilation check.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* Address Copilot review feedback on Lucene1001/Lucene1002 analyzers
- Lucene1001 CS code fix: emit ThrowStatement (not ExpressionStatement) when
converting an expression-bodied `=> throw ...` member, so the produced code
is valid C#.
- Lucene1001 CS + VB analyzers: exclude lambdas, anonymous methods, and (CS)
local functions from the base-call scan. A base call inside an uninvoked
delegate body should not satisfy the contract.
- Lucene1002 CS + VB code fixes: use ElasticCarriageReturnLineFeed instead of
hardcoded line endings so the formatter normalizes to the document's
convention.
- DiagnosticVerifier: harden System.Runtime.dll lookup with a
TRUSTED_PLATFORM_ASSEMBLIES fallback and a clear error if neither resolves.
- Tests: add VerifyCSharpFix/VerifyBasicFix coverage for Lucene1002, a
VerifyCSharpFix for the Lucene1001 expression-bodied case plus a new
throw-expression regression, lambda/local-function exclusion tests for
Lucene1001 (CS + VB), and the missing VB indirect-Tokenizer-inheritance
test for Lucene1002.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 03c5fa6 commit ffbfb36
25 files changed
Lines changed: 2110 additions & 0 deletions
File tree
- src
- Lucene.Net.Analysis.Common/Analysis
- Miscellaneous
- Sinks
- Synonym
- Lucene.Net.Analysis.Phonetic
- Lucene.Net.Highlighter/Highlight
- Lucene.Net
- Analysis
- Document
- dotnet
- Lucene.Net.CodeAnalysis.CSharp
- Lucene.Net.CodeAnalysis.VisualBasic
- Lucene.Net.Tests.CodeAnalysis
- Helpers
Lines changed: 15 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
| 3 | + | |
2 | 4 | | |
3 | 5 | | |
4 | 6 | | |
| |||
85 | 87 | | |
86 | 88 | | |
87 | 89 | | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
88 | 93 | | |
89 | 94 | | |
90 | 95 | | |
91 | 96 | | |
92 | 97 | | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
93 | 101 | | |
94 | 102 | | |
95 | 103 | | |
96 | 104 | | |
97 | 105 | | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
98 | 113 | | |
99 | 114 | | |
100 | 115 | | |
| |||
Lines changed: 11 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
| |||
169 | 170 | | |
170 | 171 | | |
171 | 172 | | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
172 | 180 | | |
173 | 181 | | |
174 | 182 | | |
175 | 183 | | |
176 | 184 | | |
177 | 185 | | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
178 | 189 | | |
179 | 190 | | |
180 | 191 | | |
| |||
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
| |||
58 | 59 | | |
59 | 60 | | |
60 | 61 | | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
61 | 66 | | |
62 | 67 | | |
63 | 68 | | |
| |||
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
| |||
248 | 249 | | |
249 | 250 | | |
250 | 251 | | |
| 252 | + | |
| 253 | + | |
251 | 254 | | |
252 | 255 | | |
253 | 256 | | |
| |||
256 | 259 | | |
257 | 260 | | |
258 | 261 | | |
| 262 | + | |
| 263 | + | |
259 | 264 | | |
260 | 265 | | |
261 | 266 | | |
| |||
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
| |||
309 | 310 | | |
310 | 311 | | |
311 | 312 | | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
312 | 318 | | |
313 | 319 | | |
314 | 320 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
| |||
118 | 119 | | |
119 | 120 | | |
120 | 121 | | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
121 | 126 | | |
122 | 127 | | |
123 | 128 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
| |||
104 | 105 | | |
105 | 106 | | |
106 | 107 | | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
107 | 112 | | |
108 | 113 | | |
109 | 114 | | |
| |||
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| |||
126 | 127 | | |
127 | 128 | | |
128 | 129 | | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
129 | 133 | | |
130 | 134 | | |
131 | 135 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
67 | 68 | | |
68 | 69 | | |
69 | 70 | | |
| 71 | + | |
| 72 | + | |
70 | 73 | | |
71 | 74 | | |
72 | 75 | | |
| |||
82 | 85 | | |
83 | 86 | | |
84 | 87 | | |
| 88 | + | |
| 89 | + | |
85 | 90 | | |
86 | 91 | | |
87 | 92 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
| |||
330 | 331 | | |
331 | 332 | | |
332 | 333 | | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
333 | 337 | | |
334 | 338 | | |
335 | 339 | | |
| |||
0 commit comments