提交 22c389e4 编写于 作者: C Cyrus Najmabadi

Get building

上级 dd9bd7aa
......@@ -153,7 +153,7 @@ internal CommitManager(ITextView textView, RecentItemsManager recentItemsManager
AsyncCompletionLogger.LogCommitTypeImportCompletionItem();
}
}
if (session.TextView.Properties.TryGetProperty(CompletionSource.TargetTypeFilterExperimentEnabled, out bool isExperimentEnabled) && isExperimentEnabled)
{
// Capture the % of committed completion items that would have appeared in the "Target type matches" filter
......
......@@ -43,7 +43,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
IEnumerable<ISymbol> members = semanticModel.LookupSymbols(position, type);
members = members.Where(m => m.CanBeReferencedByName &&
IsFieldOrReadableProperty(m) &&
!m.IsImplicitlyDeclared &&
!m.IsImplicitlyDeclared &&
!m.IsStatic);
// Filter out those members that have already been typed
......
......@@ -3,15 +3,16 @@
using System;
using System.Composition;
using System.Threading;
using Microsoft.CodeAnalysis.Editor;
using Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor;
using Microsoft.CodeAnalysis.Formatting;
using Microsoft.CodeAnalysis.Host.Mef;
using Microsoft.CodeAnalysis.Indentation;
namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.Editor
{
[Shared]
[ExportLanguageService(typeof(ISynchronousIndentationService), LanguageNames.FSharp)]
internal class FSharpSynchronousIndentationService : ISynchronousIndentationService
[ExportLanguageService(typeof(IIndentationService), LanguageNames.FSharp)]
internal class FSharpSynchronousIndentationService : IIndentationService
{
private readonly IFSharpSynchronousIndentationService _service;
......@@ -22,17 +23,23 @@ public FSharpSynchronousIndentationService(IFSharpSynchronousIndentationService
_service = service;
}
public CodeAnalysis.Editor.IndentationResult? GetDesiredIndentation(Document document, int lineNumber, CancellationToken cancellationToken)
public IndentationResult? GetDesiredIndentation(Document document, int lineNumber, CancellationToken cancellationToken)
{
var result = _service.GetDesiredIndentation(document, lineNumber, cancellationToken);
if (result.HasValue)
{
return new CodeAnalysis.Editor.IndentationResult(result.Value.BasePosition, result.Value.Offset);
return new IndentationResult(result.Value.BasePosition, result.Value.Offset);
}
else
{
return null;
}
}
IndentationResult IIndentationService.GetBlankLineIndentation(
Document document, int lineNumber, FormattingOptions.IndentStyle indentStyle, CancellationToken cancellationToken)
{
return default;
}
}
}
......@@ -21,7 +21,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim.Vi
Public Function CreateVisualBasicProjectWithNullBinPath(environment As TestEnvironment, projectName As String) As VisualBasicProject
Return New VisualBasicProject(projectName,
MockCompilerHost.FullFrameworkCompilerHost,
environment.CreateHierarchy(projectName, projectBinPath:=Nothing, projectCapabilities:="VB"),
environment.CreateHierarchy(projectName, projectBinPath:=Nothing, projectRefPath:=Nothing, projectCapabilities:="VB"),
environment.ServiceProvider,
environment.ThreadingContext,
commandLineParserServiceOpt:=New VisualBasicCommandLineParserService())
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册