Skip to content

Commit b82a615

Browse files
dotnet-botdotnet-bot
authored
Merge pull request #14380 from dotnet/merges/main-to-release/dev17.5
Merge main to release/dev17.5
2 parents ffb3909 + 458237a commit b82a615

18 files changed

+1223
-26
lines changed

‎src/Compiler/Service/ServiceParseTreeWalk.fs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,10 @@ module SyntaxTraversal =
260260
| [ x ] -> x ()
261261
| _ ->
262262
#if DEBUG
263-
assert false
264-
failwithf "multiple disjoint AST node ranges claimed to contain (%A) from %+A" pos debugObj
265-
#else
263+
printf "multiple disjoint AST node ranges claimed to contain (%A) from %+A" pos debugObj
264+
#endif
266265
ignore debugObj
267266
None
268-
#endif
269267

270268
/// traverse an implementation file walking all the way down to SynExpr or TypeAbbrev at a particular location
271269
///

‎vsintegration/src/FSharp.Editor/FSharp.Editor.resx‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,26 @@
159159
<data name="6008" xml:space="preserve">
160160
<value>IntelliSense</value>
161161
</data>
162+
<data name="IntelliSensePageKeywords" xml:space="preserve">
163+
<value>Completion Lists;
164+
Show completion list after a character is deleted;
165+
Show completion list after a character is typed;
166+
Show symbols in unopened namespaces;
167+
Enter key behavior;
168+
Never add new line on enter;
169+
Only add new line on enter after end of fully typed word;
170+
Always add new line on enter;</value>
171+
</data>
162172
<data name="6009" xml:space="preserve">
163173
<value>QuickInfo</value>
164174
</data>
175+
<data name="QuickInfoPageKeywords" xml:space="preserve">
176+
<value>Navigation links;
177+
Show navigation links as;
178+
Solid underline;
179+
Dot underline;
180+
Dash underline;</value>
181+
</data>
165182
<data name="AddAssemblyReference" xml:space="preserve">
166183
<value>Add an assembly reference to '{0}'</value>
167184
</data>
@@ -171,15 +188,44 @@
171188
<data name="6010" xml:space="preserve">
172189
<value>Code Fixes</value>
173190
</data>
191+
<data name="CodeFixesPageKeywords" xml:space="preserve">
192+
<value>Simplify names (remove unnecessary qualifiers);
193+
Always place open statements at the top level;
194+
Remove unused open statements;
195+
Analyze and suggest fixes for unused values;
196+
Suggest names for unresolved identifiers;</value>
197+
</data>
174198
<data name="6011" xml:space="preserve">
175199
<value>Performance</value>
176200
</data>
201+
<data name="PerformancePageKeywords" xml:space="preserve">
202+
<value>F# Project and Caching Performance Options;
203+
Enable in-memory cross project references;
204+
IntelliSense Performance Options;
205+
Enable stale data for IntelliSense features;
206+
Time until stale results are used (in milliseconds);
207+
Parallelization (requires restart);
208+
Enable parallel type checking with signature files;
209+
Enable parallel reference resolution</value>
210+
</data>
177211
<data name="6012" xml:space="preserve">
178212
<value>Advanced</value>
179213
</data>
214+
<data name="AdvancedPageKeywords" xml:space="preserve">
215+
<value>Block Structure Guides;
216+
Show structure guidelines for F# code;
217+
Outlining;
218+
Show outlining and collapsible nodes for F# code;
219+
Inline hints;
220+
Display inline type hints (experimental);
221+
Display inline parameter name hints (experimental);Beer</value>
222+
</data>
180223
<data name="6014" xml:space="preserve">
181224
<value>Formatting</value>
182225
</data>
226+
<data name="FormattingPageKeywords" xml:space="preserve">
227+
<value>Re-format indentation on paste (Experimental)</value>
228+
</data>
183229
<data name="TheValueIsUnused" xml:space="preserve">
184230
<value>The value is unused</value>
185231
</data>

‎vsintegration/src/FSharp.Editor/Hints/InlineParameterNameHints.fs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ module InlineParameterNameHints =
3131
not field.IsNameGenerated
3232

3333
let isMemberOrFunctionOrValueValidForHint (symbol: FSharpMemberOrFunctionOrValue) (symbolUse: FSharpSymbolUse) =
34-
// make sure we're looking at a call site and not the definition
3534
if symbolUse.IsFromUse then
36-
// is there a better way?
3735
let isNotBuiltInOperator =
3836
symbol.DeclaringEntity
3937
|> Option.exists (fun entity -> entity.CompiledName <> "Operators")
@@ -45,7 +43,6 @@ module InlineParameterNameHints =
4543
false
4644

4745
let isUnionCaseValidForHint (symbol: FSharpUnionCase) (symbolUse: FSharpSymbolUse) =
48-
// is the union case being used as a constructor and is it not Cons
4946
symbolUse.IsFromUse
5047
&& symbol.DisplayName <> "(::)"
5148

‎vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,12 @@ type internal FSharpSettingsFactory
193193
Width = 360,
194194
Height = 120,
195195
Window="34E76E81-EE4A-11D0-AE2E-00A0C90FFFC3")>]
196-
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.IntelliSenseOptionPage>, "F#", null, "IntelliSense", "6008")>]
197-
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.QuickInfoOptionPage>, "F#", null, "QuickInfo", "6009")>]
198-
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.CodeFixesOptionPage>, "F#", null, "Code Fixes", "6010")>]
199-
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.LanguageServicePerformanceOptionPage>, "F#", null, "Performance", "6011")>]
200-
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.AdvancedSettingsOptionPage>, "F#", null, "Advanced", "6012")>]
201-
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.FormattingOptionPage>, "F#", null, "Formatting", "6014")>]
196+
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.IntelliSenseOptionPage>, "F#", null, "IntelliSense", "6008", "IntelliSensePageKeywords")>]
197+
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.QuickInfoOptionPage>, "F#", null, "QuickInfo", "6009", "QuickInfoPageKeywords")>]
198+
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.CodeFixesOptionPage>, "F#", null, "Code Fixes", "6010", "CodeFixesPageKeywords")>]
199+
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.LanguageServicePerformanceOptionPage>, "F#", null, "Performance", "6011", "PerformancePageKeywords")>]
200+
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.AdvancedSettingsOptionPage>, "F#", null, "Advanced", "6012", "AdvancedPageKeywords")>]
201+
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.FormattingOptionPage>, "F#", null, "Formatting", "6014", "FormattingPageKeywords")>]
202202
[<ProvideFSharpVersionRegistration(FSharpConstants.projectPackageGuidString, "Microsoft Visual F#")>]
203203
// 64 represents a hex number. It needs to be greater than 37 so the TextMate editor will not be chosen as higher priority.
204204
[<ProvideEditorExtension(typeof<FSharpEditorFactory>, ".fs", 64)>]

‎vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf‎

Lines changed: 87 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,36 @@
2727
<target state="translated">Přidat anotaci typu</target>
2828
<note />
2929
</trans-unit>
30+
<trans-unit id="AdvancedPageKeywords">
31+
<source>Block Structure Guides;
32+
Show structure guidelines for F# code;
33+
Outlining;
34+
Show outlining and collapsible nodes for F# code;
35+
Inline hints;
36+
Display inline type hints (experimental);
37+
Display inline parameter name hints (experimental);Beer</source>
38+
<target state="new">Block Structure Guides;
39+
Show structure guidelines for F# code;
40+
Outlining;
41+
Show outlining and collapsible nodes for F# code;
42+
Inline hints;
43+
Display inline type hints (experimental);
44+
Display inline parameter name hints (experimental);Beer</target>
45+
<note />
46+
</trans-unit>
47+
<trans-unit id="CodeFixesPageKeywords">
48+
<source>Simplify names (remove unnecessary qualifiers);
49+
Always place open statements at the top level;
50+
Remove unused open statements;
51+
Analyze and suggest fixes for unused values;
52+
Suggest names for unresolved identifiers;</source>
53+
<target state="new">Simplify names (remove unnecessary qualifiers);
54+
Always place open statements at the top level;
55+
Remove unused open statements;
56+
Analyze and suggest fixes for unused values;
57+
Suggest names for unresolved identifiers;</target>
58+
<note />
59+
</trans-unit>
3060
<trans-unit id="ConvertCSharpUsingToFSharpOpen">
3161
<source>Convert C# 'using' to F# 'open'</source>
3262
<target state="new">Convert C# 'using' to F# 'open'</target>
@@ -72,6 +102,11 @@
72102
<target state="translated">Funkce jazyka F#</target>
73103
<note />
74104
</trans-unit>
105+
<trans-unit id="FormattingPageKeywords">
106+
<source>Re-format indentation on paste (Experimental)</source>
107+
<target state="new">Re-format indentation on paste (Experimental)</target>
108+
<note />
109+
</trans-unit>
75110
<trans-unit id="ImplementInterface">
76111
<source>Implement interface</source>
77112
<target state="translated">Implementujte rozhraní.</target>
@@ -82,6 +117,25 @@
82117
<target state="translated">Implementujte rozhraní bez anotace typu.</target>
83118
<note />
84119
</trans-unit>
120+
<trans-unit id="IntelliSensePageKeywords">
121+
<source>Completion Lists;
122+
Show completion list after a character is deleted;
123+
Show completion list after a character is typed;
124+
Show symbols in unopened namespaces;
125+
Enter key behavior;
126+
Never add new line on enter;
127+
Only add new line on enter after end of fully typed word;
128+
Always add new line on enter;</source>
129+
<target state="new">Completion Lists;
130+
Show completion list after a character is deleted;
131+
Show completion list after a character is typed;
132+
Show symbols in unopened namespaces;
133+
Enter key behavior;
134+
Never add new line on enter;
135+
Only add new line on enter after end of fully typed word;
136+
Always add new line on enter;</target>
137+
<note />
138+
</trans-unit>
85139
<trans-unit id="MakeDeclarationMutable">
86140
<source>Make declaration 'mutable'</source>
87141
<target state="translated">Nastavte deklaraci jako mutable.</target>
@@ -92,11 +146,43 @@
92146
<target state="translated">Nastavit {0} jako rekurzivní</target>
93147
<note />
94148
</trans-unit>
149+
<trans-unit id="PerformancePageKeywords">
150+
<source>F# Project and Caching Performance Options;
151+
Enable in-memory cross project references;
152+
IntelliSense Performance Options;
153+
Enable stale data for IntelliSense features;
154+
Time until stale results are used (in milliseconds);
155+
Parallelization (requires restart);
156+
Enable parallel type checking with signature files;
157+
Enable parallel reference resolution</source>
158+
<target state="new">F# Project and Caching Performance Options;
159+
Enable in-memory cross project references;
160+
IntelliSense Performance Options;
161+
Enable stale data for IntelliSense features;
162+
Time until stale results are used (in milliseconds);
163+
Parallelization (requires restart);
164+
Enable parallel type checking with signature files;
165+
Enable parallel reference resolution</target>
166+
<note />
167+
</trans-unit>
95168
<trans-unit id="PrefixValueNameWithUnderscore">
96169
<source>Prefix '{0}' with underscore</source>
97170
<target state="translated">Před {0} vložte podtržítko.</target>
98171
<note />
99172
</trans-unit>
173+
<trans-unit id="QuickInfoPageKeywords">
174+
<source>Navigation links;
175+
Show navigation links as;
176+
Solid underline;
177+
Dot underline;
178+
Dash underline;</source>
179+
<target state="new">Navigation links;
180+
Show navigation links as;
181+
Solid underline;
182+
Dot underline;
183+
Dash underline;</target>
184+
<note />
185+
</trans-unit>
100186
<trans-unit id="RemoveReturn">
101187
<source>Remove 'return'</source>
102188
<target state="translated">Odebrat return</target>
@@ -164,7 +250,7 @@
164250
</trans-unit>
165251
<trans-unit id="6008">
166252
<source>IntelliSense</source>
167-
<target state="translated">IntelliSense</target>
253+
<target state="needs-review-translation">IntelliSense</target>
168254
<note />
169255
</trans-unit>
170256
<trans-unit id="6009">

‎vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf‎

Lines changed: 87 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,36 @@
2727
<target state="translated">Typanmerkung hinzufügen</target>
2828
<note />
2929
</trans-unit>
30+
<trans-unit id="AdvancedPageKeywords">
31+
<source>Block Structure Guides;
32+
Show structure guidelines for F# code;
33+
Outlining;
34+
Show outlining and collapsible nodes for F# code;
35+
Inline hints;
36+
Display inline type hints (experimental);
37+
Display inline parameter name hints (experimental);Beer</source>
38+
<target state="new">Block Structure Guides;
39+
Show structure guidelines for F# code;
40+
Outlining;
41+
Show outlining and collapsible nodes for F# code;
42+
Inline hints;
43+
Display inline type hints (experimental);
44+
Display inline parameter name hints (experimental);Beer</target>
45+
<note />
46+
</trans-unit>
47+
<trans-unit id="CodeFixesPageKeywords">
48+
<source>Simplify names (remove unnecessary qualifiers);
49+
Always place open statements at the top level;
50+
Remove unused open statements;
51+
Analyze and suggest fixes for unused values;
52+
Suggest names for unresolved identifiers;</source>
53+
<target state="new">Simplify names (remove unnecessary qualifiers);
54+
Always place open statements at the top level;
55+
Remove unused open statements;
56+
Analyze and suggest fixes for unused values;
57+
Suggest names for unresolved identifiers;</target>
58+
<note />
59+
</trans-unit>
3060
<trans-unit id="ConvertCSharpUsingToFSharpOpen">
3161
<source>Convert C# 'using' to F# 'open'</source>
3262
<target state="new">Convert C# 'using' to F# 'open'</target>
@@ -72,6 +102,11 @@
72102
<target state="translated">F#-Funktionen</target>
73103
<note />
74104
</trans-unit>
105+
<trans-unit id="FormattingPageKeywords">
106+
<source>Re-format indentation on paste (Experimental)</source>
107+
<target state="new">Re-format indentation on paste (Experimental)</target>
108+
<note />
109+
</trans-unit>
75110
<trans-unit id="ImplementInterface">
76111
<source>Implement interface</source>
77112
<target state="translated">Schnittstelle implementieren</target>
@@ -82,6 +117,25 @@
82117
<target state="translated">Schnittstelle ohne Typanmerkung implementieren</target>
83118
<note />
84119
</trans-unit>
120+
<trans-unit id="IntelliSensePageKeywords">
121+
<source>Completion Lists;
122+
Show completion list after a character is deleted;
123+
Show completion list after a character is typed;
124+
Show symbols in unopened namespaces;
125+
Enter key behavior;
126+
Never add new line on enter;
127+
Only add new line on enter after end of fully typed word;
128+
Always add new line on enter;</source>
129+
<target state="new">Completion Lists;
130+
Show completion list after a character is deleted;
131+
Show completion list after a character is typed;
132+
Show symbols in unopened namespaces;
133+
Enter key behavior;
134+
Never add new line on enter;
135+
Only add new line on enter after end of fully typed word;
136+
Always add new line on enter;</target>
137+
<note />
138+
</trans-unit>
85139
<trans-unit id="MakeDeclarationMutable">
86140
<source>Make declaration 'mutable'</source>
87141
<target state="translated">Deklaration "änderbar" machen</target>
@@ -92,11 +146,43 @@
92146
<target state="translated">"{0}" als rekursiv festlegen</target>
93147
<note />
94148
</trans-unit>
149+
<trans-unit id="PerformancePageKeywords">
150+
<source>F# Project and Caching Performance Options;
151+
Enable in-memory cross project references;
152+
IntelliSense Performance Options;
153+
Enable stale data for IntelliSense features;
154+
Time until stale results are used (in milliseconds);
155+
Parallelization (requires restart);
156+
Enable parallel type checking with signature files;
157+
Enable parallel reference resolution</source>
158+
<target state="new">F# Project and Caching Performance Options;
159+
Enable in-memory cross project references;
160+
IntelliSense Performance Options;
161+
Enable stale data for IntelliSense features;
162+
Time until stale results are used (in milliseconds);
163+
Parallelization (requires restart);
164+
Enable parallel type checking with signature files;
165+
Enable parallel reference resolution</target>
166+
<note />
167+
</trans-unit>
95168
<trans-unit id="PrefixValueNameWithUnderscore">
96169
<source>Prefix '{0}' with underscore</source>
97170
<target state="translated">"{0}" einen Unterstrich voranstellen</target>
98171
<note />
99172
</trans-unit>
173+
<trans-unit id="QuickInfoPageKeywords">
174+
<source>Navigation links;
175+
Show navigation links as;
176+
Solid underline;
177+
Dot underline;
178+
Dash underline;</source>
179+
<target state="new">Navigation links;
180+
Show navigation links as;
181+
Solid underline;
182+
Dot underline;
183+
Dash underline;</target>
184+
<note />
185+
</trans-unit>
100186
<trans-unit id="RemoveReturn">
101187
<source>Remove 'return'</source>
102188
<target state="translated">"return" entfernen</target>
@@ -164,7 +250,7 @@
164250
</trans-unit>
165251
<trans-unit id="6008">
166252
<source>IntelliSense</source>
167-
<target state="translated">IntelliSense</target>
253+
<target state="needs-review-translation">IntelliSense</target>
168254
<note />
169255
</trans-unit>
170256
<trans-unit id="6009">

0 commit comments

Comments
 (0)