Skip to content

Commit 20d90f0

Browse files
committed
Use LangVersion 14 and fix field warnings/errors
1 parent e9ade1f commit 20d90f0

19 files changed

Lines changed: 26 additions & 28 deletions

File tree

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</PropertyGroup>
2727

2828
<PropertyGroup>
29-
<LangVersion>11.0</LangVersion>
29+
<LangVersion>14.0</LangVersion>
3030
<GitHubOrganization>apache</GitHubOrganization>
3131
<GitHubProject>lucenenet</GitHubProject>
3232
</PropertyGroup>

src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ public override long UniqueTermCount
163163
get
164164
{
165165
long numTerms = 0;
166-
foreach (DirectField field in fields.Values)
166+
foreach (DirectField f in fields.Values)
167167
{
168-
numTerms += field.terms.Length;
168+
numTerms += f.terms.Length;
169169
}
170170
return numTerms;
171171
}

src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -931,13 +931,13 @@ public override TermsEnum GetEnumerator()
931931
public override IComparer<BytesRef> Comparer => BytesRef.UTF8SortedAsUnicodeComparer;
932932

933933
// LUCENENET specific - to avoid boxing, changed from CompareTo() to IndexOptionsComparer.Compare()
934-
public override bool HasFreqs => IndexOptionsComparer.Default.Compare(field.IndexOptions, IndexOptions.DOCS_AND_FREQS) >= 0;
934+
public override bool HasFreqs => IndexOptionsComparer.Default.Compare(this.field.IndexOptions, IndexOptions.DOCS_AND_FREQS) >= 0;
935935

936-
public override bool HasOffsets => IndexOptionsComparer.Default.Compare(field.IndexOptions, IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) >= 0;
936+
public override bool HasOffsets => IndexOptionsComparer.Default.Compare(this.field.IndexOptions, IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) >= 0;
937937

938-
public override bool HasPositions => IndexOptionsComparer.Default.Compare(field.IndexOptions, IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0;
938+
public override bool HasPositions => IndexOptionsComparer.Default.Compare(this.field.IndexOptions, IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0;
939939

940-
public override bool HasPayloads => field.HasPayloads;
940+
public override bool HasPayloads => this.field.HasPayloads;
941941

942942
public long RamBytesUsed()
943943
{

src/Lucene.Net.Facet/SortedSet/DefaultSortedSetDocValuesReaderState.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public override OrdRange GetOrdRange(string dim)
125125
/// <summary>
126126
/// Indexed field we are reading.
127127
/// </summary>
128-
public override string Field => field;
128+
public override string Field => this.field;
129129

130130
public override IndexReader OrigReader => origReader;
131131

src/Lucene.Net.Facet/Taxonomy/DocValuesOrdinalsReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public override void Get(int docID, Int32sRef ordinals)
8282
}
8383
}
8484

85-
public override string IndexFieldName => field;
85+
public override string IndexFieldName => this.field;
8686

8787
/// <summary>
8888
/// Subclass &amp; override if you change the encoding.

src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class ReverseOrdFieldSource : ValueSource
4848
{
4949
// LUCENENET NOTE: Made private and added public property for reading
5050
private readonly string field;
51-
public string Field => field;
51+
public string Field => this.field;
5252

5353
public ReverseOrdFieldSource(string field)
5454
{

src/Lucene.Net.QueryParser/ComplexPhrase/ComplexPhraseQueryParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public ComplexPhraseQuery(string field, string phrasedQueryStringContents,
227227
this.inOrder = inOrder;
228228
}
229229

230-
public string Field => field;
230+
public string Field => this.field;
231231

232232
// Called by ComplexPhraseQueryParser for each phrase after the main
233233
// parse

src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/AbstractRangeQueryNode.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,20 @@ public virtual string Field
5252
{
5353
get
5454
{
55-
string field = null;
55+
string f = null;
5656
T lower = (T)LowerBound;
5757
T upper = (T)UpperBound;
5858

5959
if (lower != null)
6060
{
61-
field = lower.Field;
62-
61+
f = lower.Field;
6362
}
6463
else if (upper != null)
6564
{
66-
field = upper.Field;
65+
f = upper.Field;
6766
}
6867

69-
return field;
68+
return f;
7069
}
7170
set
7271
{

src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/RegexpQueryNode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public virtual ICharSequence Text
9999

100100
public virtual string Field
101101
{
102-
get => field;
102+
get => this.field;
103103
set => this.field = value;
104104
}
105105

src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
<PropertyGroup>
2727
<AssemblyTitle>Lucene.Net.Tests.Analysis.Kuromoji</AssemblyTitle>
28-
<LangVersion>14.0</LangVersion>
2928
</PropertyGroup>
3029

3130
<ItemGroup>

0 commit comments

Comments
 (0)