Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfa1cd8a

Browse files
cartermpKevinRansom
authored andcommitted
[15.8] Enable the codelens settings (#4950)
* Enable the codelens settings* Update EditorOptions.fs* Gray out options when disabled* herp* Label experimental
1 parentfd6105d commitfa1cd8a

File tree

18 files changed

+58
-49
lines changed

18 files changed

+58
-49
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@ type internal FSharpCheckerWorkspaceServiceFactory
328328
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.CodeFixesOptionPage>,"F#",null,"Code Fixes","6010")>]
329329
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.LanguageServicePerformanceOptionPage>,"F#",null,"Performance","6011")>]
330330
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.AdvancedSettingsOptionPage>,"F#",null,"Advanced","6012")>]
331+
[<ProvideLanguageEditorOptionPage(typeof<OptionsUI.CodeLensOptionPage>,"F#",null,"CodeLens","6013")>]
331332
[<ProvideFSharpVersionRegistration(FSharpConstants.projectPackageGuidString,"Microsoft Visual F#")>]
332333
// 64 represents a hex number. It needs to be greater than 37 so the TextMate editor will not be chosen as higher priority.
333334
[<ProvideEditorExtension(typeof<FSharpEditorFactory>,".fs",64)>]

‎vsintegration/src/FSharp.Editor/Options/EditorOptions.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ type internal Settings [<ImportingConstructor>](store: SettingsStore) =
8787
IsOutliningEnabled=true}
8888

8989
store.RegisterDefault
90-
{ Enabled=true
90+
{ Enabled=false
9191
UseColors=false
92-
ReplaceWithLineLens=true
92+
ReplaceWithLineLens=true
9393
Prefix="//"}
9494

9595
interface ISettings

‎vsintegration/src/FSharp.UIResources/CodeLensOptionControl.xaml‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,31 @@
1919
<StackPanel>
2020
<GroupBoxHeader="{x:Static local:Strings.CodeLens}">
2121
<StackPanel>
22-
<CheckBoxx:Name="enableCodeLens"IsChecked="{Binding Enabled}"
23-
Content="{x:Static local:Strings.CodeLens_Switch}"/>
24-
<CheckBoxx:Name="useColors"IsChecked="{Binding UseColors}"
25-
Content="{x:Static local:Strings.CodeLens_UseColors}"/>
26-
<CheckBoxx:Name="replaceWithLineLens"IsChecked="{Binding ReplaceWithLineLens}"
27-
Content="{x:Static local:Strings.CodeLens_Replace_LineLens}"/>
28-
<Grid>
29-
<Grid.ColumnDefinitions>
30-
<ColumnDefinitionWidth="Auto"/>
31-
<ColumnDefinitionWidth="70" />
32-
</Grid.ColumnDefinitions>
33-
<Label Grid.Column="0"Content="{x:Static local:Strings.CodeLens_Prefix}"/>
34-
<TextBoxx:Name="prefix" Grid.Column="1"
35-
Text="{Binding Prefix, UpdateSourceTrigger=PropertyChanged}"
36-
HorizontalContentAlignment="Right"
37-
VerticalContentAlignment="Center"Margin="7,0,-116,0">
38-
</TextBox>
39-
</Grid>
22+
<StackPanel>
23+
<CheckBoxx:Name="enableCodeLens"IsChecked="{Binding Enabled}"
24+
Content="{x:Static local:Strings.CodeLens_Switch}"/>
25+
</StackPanel>
26+
<StackPanelMargin="15 0 0 0">
27+
<CheckBoxx:Name="useColors"IsChecked="{Binding UseColors}"
28+
Content="{x:Static local:Strings.CodeLens_UseColors}"
29+
IsEnabled="{Binding IsChecked, ElementName=enableCodeLens}"/>
30+
<CheckBoxx:Name="replaceWithLineLens"IsChecked="{Binding ReplaceWithLineLens}"
31+
Content="{x:Static local:Strings.CodeLens_Replace_LineLens}"
32+
IsEnabled="{Binding IsChecked, ElementName=enableCodeLens}"/>
33+
<Grid>
34+
<Grid.ColumnDefinitions>
35+
<ColumnDefinitionWidth="Auto"/>
36+
<ColumnDefinitionWidth="70" />
37+
</Grid.ColumnDefinitions>
38+
<Label Grid.Column="0"Content="{x:Static local:Strings.CodeLens_Prefix}"/>
39+
<TextBoxx:Name="prefix" Grid.Column="1"
40+
Text="{Binding Prefix, UpdateSourceTrigger=PropertyChanged}"
41+
HorizontalContentAlignment="Right"
42+
VerticalContentAlignment="Center"Margin="7,0,-116,0"
43+
IsEnabled="{Binding IsChecked, ElementName=enableCodeLens}">
44+
</TextBox>
45+
</Grid>
46+
</StackPanel>
4047
</StackPanel>
4148
</GroupBox>
4249
</StackPanel>

‎vsintegration/src/FSharp.UIResources/Strings.resx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
value : The object must be serialized with
5454
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
5555
: and then encoded with base64 encoding.
56+
5657
mimetype: application/x-microsoft.net.object.bytearray.base64
5758
value : The object must be serialized into a byte array
5859
: using a System.ComponentModel.TypeConverter
@@ -186,7 +187,7 @@
186187
<value>Show annotations to the right instead of above the line</value>
187188
</data>
188189
<dataname="CodeLens_Switch"xml:space="preserve">
189-
<value>Show type signature annotations in the editor</value>
190+
<value>Enable CodeLens (Experimental)</value>
190191
</data>
191192
<dataname="CodeLens_Prefix"xml:space="preserve">
192193
<value>Annotation prefix</value>

‎vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118
<note />
119119
</trans-unit>
120120
<trans-unitid="CodeLens_Switch">
121-
<source>Show type signature annotations in the editor</source>
122-
<targetstate="new">Show type signature annotations in the editor</target>
121+
<source>Enable CodeLens (Experimental)</source>
122+
<targetstate="new">Enable CodeLens (Experimental)</target>
123123
<note />
124124
</trans-unit>
125125
<trans-unitid="CodeLens_Prefix">

‎vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118
<note />
119119
</trans-unit>
120120
<trans-unitid="CodeLens_Switch">
121-
<source>Show type signature annotations in the editor</source>
122-
<targetstate="new">Show type signature annotations in the editor</target>
121+
<source>Enable CodeLens (Experimental)</source>
122+
<targetstate="new">Enable CodeLens (Experimental)</target>
123123
<note />
124124
</trans-unit>
125125
<trans-unitid="CodeLens_Prefix">

‎vsintegration/src/FSharp.UIResources/xlf/Strings.en.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118
<note />
119119
</trans-unit>
120120
<trans-unitid="CodeLens_Switch">
121-
<source>Show type signature annotations in the editor</source>
122-
<targetstate="new">Show type signature annotations in the editor</target>
121+
<source>Enable CodeLens (Experimental)</source>
122+
<targetstate="new">Enable CodeLens (Experimental)</target>
123123
<note />
124124
</trans-unit>
125125
<trans-unitid="CodeLens_Prefix">

‎vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118
<note />
119119
</trans-unit>
120120
<trans-unitid="CodeLens_Switch">
121-
<source>Show type signature annotations in the editor</source>
122-
<targetstate="new">Show type signature annotations in the editor</target>
121+
<source>Enable CodeLens (Experimental)</source>
122+
<targetstate="new">Enable CodeLens (Experimental)</target>
123123
<note />
124124
</trans-unit>
125125
<trans-unitid="CodeLens_Prefix">

‎vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118
<note />
119119
</trans-unit>
120120
<trans-unitid="CodeLens_Switch">
121-
<source>Show type signature annotations in the editor</source>
122-
<targetstate="new">Show type signature annotations in the editor</target>
121+
<source>Enable CodeLens (Experimental)</source>
122+
<targetstate="new">Enable CodeLens (Experimental)</target>
123123
<note />
124124
</trans-unit>
125125
<trans-unitid="CodeLens_Prefix">

‎vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118
<note />
119119
</trans-unit>
120120
<trans-unitid="CodeLens_Switch">
121-
<source>Show type signature annotations in the editor</source>
122-
<targetstate="new">Show type signature annotations in the editor</target>
121+
<source>Enable CodeLens (Experimental)</source>
122+
<targetstate="new">Enable CodeLens (Experimental)</target>
123123
<note />
124124
</trans-unit>
125125
<trans-unitid="CodeLens_Prefix">

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp