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

Commit67986c9

Browse files
authored
Merge pull request #3434 from brettfo/merge-vs2017-rtm-into-master
Merge vs2017-rtm into master
2 parentsff91624 +3588992 commit67986c9

File tree

15 files changed

+80
-50
lines changed

15 files changed

+80
-50
lines changed

‎setup/publish-assets.ps1‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,22 @@ $ErrorActionPreference = "Stop"
2424

2525
try {
2626
$branchName=$branchName-Replace"refs/heads/"# get rid of prefix
27+
$requestUrl=""
2728

2829
switch ($branchName) {
29-
"microbuild" { }
30+
"microbuild" {
31+
$requestUrl="https://dotnet.myget.org/F/fsharp/vsix/upload"
32+
}
33+
"microbuild-dev15-rtm" {
34+
$requestUrl="https://dotnet.myget.org/F/fsharp-preview/vsix/upload"
35+
}
3036
default {
3137
Write-Host"Branch [$branchName] is not supported for publishing."
3238
exit0# non-fatal
3339
}
3440
}
3541

3642
$branchName=$branchName.Replace("/","_")# can't have slashes in the branch name
37-
$requestUrl="https://dotnet.myget.org/F/fsharp/vsix/upload"
3843
$vsix=Join-Path$binariesPath"net40\bin\VisualFSharpFull.vsix"
3944

4045
Write-Host" Uploading '$vsix' to '$requestUrl'."

‎src/FSharpSource.Settings.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
<WarningsAsErrors />
3333
<FX_NO_LOADERCondition=" '$(FX_NO_LOADER)'==''">false</FX_NO_LOADER>
3434

35-
<RoslynVersion>2.0.0</RoslynVersion>
35+
<RoslynVersion>2.3.0-beta2-61719-01</RoslynVersion>
3636
<RoslynVSBinariesVersion>15.0</RoslynVSBinariesVersion>
3737
<RoslynVSPackagesVersion>15.0.26201</RoslynVSPackagesVersion>
3838
<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.26201</VSSDK_BUILDTOOLS_VERSION>
3939

40-
<MicrosoftVisualStudioThreadingVersion>15.0.240</MicrosoftVisualStudioThreadingVersion>
41-
<MicrosoftVisualStudioValidationVersion>15.0.82</MicrosoftVisualStudioValidationVersion>
40+
<MicrosoftVisualStudioThreadingVersion>15.3.23</MicrosoftVisualStudioThreadingVersion>
41+
<MicrosoftVisualStudioValidationVersion>15.3.15</MicrosoftVisualStudioValidationVersion>
4242

4343
<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists-->
4444
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>

‎vsintegration/packages.config‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<packageid="System.Reflection.Metadata"version="1.4.2"targetFramework="net46" />
88
<packageid="Microsoft.Composition"version="1.0.30"targetFramework="net46" />
99

10-
<packageid="Microsoft.CodeAnalysis.Common"version="2.0.0"targetFramework="net46" />
11-
<packageid="Microsoft.CodeAnalysis.EditorFeatures"version="2.0.0"targetFramework="net46" />
12-
<packageid="Microsoft.CodeAnalysis.EditorFeatures.Text"version="2.0.0"targetFramework="net46" />
13-
<packageid="Microsoft.CodeAnalysis.Features"version="2.0.0"targetFramework="net46" />
14-
<packageid="Microsoft.CodeAnalysis.Workspaces.Common"version="2.0.0"targetFramework="net46" />
15-
<packageid="Microsoft.VisualStudio.LanguageServices"version="2.0.0"targetFramework="net46" />
10+
<packageid="Microsoft.CodeAnalysis.Common"version="2.3.0-beta2-61719-01"targetFramework="net46" />
11+
<packageid="Microsoft.CodeAnalysis.EditorFeatures"version="2.3.0-beta2-61719-01"targetFramework="net46" />
12+
<packageid="Microsoft.CodeAnalysis.EditorFeatures.Text"version="2.3.0-beta2-61719-01"targetFramework="net46" />
13+
<packageid="Microsoft.CodeAnalysis.Features"version="2.3.0-beta2-61719-01"targetFramework="net46" />
14+
<packageid="Microsoft.CodeAnalysis.Workspaces.Common"version="2.3.0-beta2-61719-01"targetFramework="net46" />
15+
<packageid="Microsoft.VisualStudio.LanguageServices"version="2.3.0-beta2-61719-01"targetFramework="net46" />
1616

1717
<packageid="EnvDTE"version="8.0.1"targetFramework="net46" />
1818
<packageid="EnvDTE80"version="8.0.1"targetFramework="net46" />
@@ -44,8 +44,8 @@
4444
<packageid="Microsoft.VisualFSharp.Microsoft.VisualStudio.Shell.UI.Internal"version="14.0.25420"targetFramework="net46" />
4545

4646
<packageid="Microsoft.VisualStudio.Shell.Immutable.15.0"version="15.0.25123-Dev15Preview"targetFramework="net46" />
47-
<packageid="Microsoft.VisualStudio.Threading"version="15.0.240"targetFramework="net46" />
48-
<packageid="Microsoft.VisualStudio.Validation"version="15.0.82"targetFramework="net46" />
47+
<packageid="Microsoft.VisualStudio.Threading"version="15.3.23"targetFramework="net46" />
48+
<packageid="Microsoft.VisualStudio.Validation"version="15.3.15"targetFramework="net46" />
4949
<packageid="Microsoft.VisualStudio.Shell.Design"version="15.0.26201"targetFramework="net46" />
5050
<packageid="Microsoft.VisualStudio.Package.LanguageService.15.0"version="15.0.26201"targetFramework="net46" />
5151
<packageid="Microsoft.VisualStudio.Editor"version="15.0.26201"targetFramework="net46" />

‎vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ type internal FSharpCompletionProvider
4747
|> List.filter(fun(keyword,_)->not(PrettyNaming.IsOperatorName keyword))
4848
|> List.sortBy(fun(keyword,_)-> keyword)
4949
|> List.mapi(fun n(keyword,description)->
50-
CommonCompletionItem.Create(keyword, Nullable Glyph.Keyword, sortText= sprintf"%06d"(1000000+ n))
50+
CommonCompletionItem.Create(keyword,CompletionItemRules.Default,Nullable Glyph.Keyword, sortText= sprintf"%06d"(1000000+ n))
5151
.AddProperty("description", description)
5252
.AddProperty(IsKeywordPropName,""))
5353

‎vsintegration/src/FSharp.Editor/Completion/FileSystemCompletion.fs‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ open System.Threading
1010
openSystem.Threading.Tasks
1111
openMicrosoft.CodeAnalysis
1212
openMicrosoft.CodeAnalysis.Completion
13-
openMicrosoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.FileSystem
1413
openMicrosoft.CodeAnalysis.Text
1514
openMicrosoft.CodeAnalysis.Classification
1615

@@ -35,15 +34,9 @@ type internal HashDirectiveCompletionProvider(workspace: Workspace, projectInfoM
3534

3635
letgetPathThroughLastSlash(text:SourceText,position:int,quotedPathGroup:Group)=
3736
PathCompletionUtilities.GetPathThroughLastSlash(
38-
quotedPath= quotedPathGroup.Value,
39-
quotedPathStart= getQuotedPathStart(text, position, quotedPathGroup),
40-
position= position)
41-
42-
letgetTextChangeSpan(text:SourceText,position:int,quotedPathGroup:Group)=
43-
PathCompletionUtilities.GetTextChangeSpan(
44-
quotedPath= quotedPathGroup.Value,
45-
quotedPathStart= getQuotedPathStart(text, position, quotedPathGroup),
46-
position= position)
37+
quotedPathGroup.Value,
38+
getQuotedPathStart(text, position, quotedPathGroup),
39+
position)
4740

4841
letgetFileGlyph(extention:string)=
4942
match extentionwith
@@ -117,30 +110,26 @@ type internal HashDirectiveCompletionProvider(workspace: Workspace, projectInfoM
117110
letsnapshot= text.FindCorrespondingEditorTextSnapshot()
118111

119112
do! Option.guard(not(isNull snapshot))
120-
letfileSystem= CurrentWorkingDirectoryDiscoveryService.GetService(snapshot)
121-
113+
122114
letextraSearchPaths=
123115
if completion.UseIncludeDirectivesthen
124116
getIncludeDirectives(text, position)
125117
else[]
126-
118+
127119
letdefaultSearchPath= Path.GetDirectoryName document.FilePath
128120
letsearchPaths= defaultSearchPath:: extraSearchPaths
129-
121+
130122
lethelper=
131123
FileSystemCompletionHelper(
132-
this,
133-
getTextChangeSpan(text, position, quotedPathGroup),
134-
fileSystem,
135124
Glyph.OpenFolder,
136125
completion.AllowableExtensions|> List.tryPick getFileGlyph|> Option.defaultValue Glyph.None,
137-
searchPaths= Seq.toImmutableArray searchPaths,
138-
allowableExtensions= completion.AllowableExtensions,
139-
itemRules= rules)
126+
Seq.toImmutableArray searchPaths,
127+
null,
128+
completion.AllowableExtensions|> Seq.toImmutableArray,
129+
rules)
140130

141131
letpathThroughLastSlash= getPathThroughLastSlash(text, position, quotedPathGroup)
142-
letdocumentPath=if document.Project.IsSubmissionthennullelse document.FilePath
143-
context.AddItems(helper.GetItems(pathThroughLastSlash, documentPath))
132+
context.AddItems(helper.GetItems(pathThroughLastSlash, ct))
144133
}
145134
|> Async.Ignore
146135
|> RoslynHelpers.StartAsyncUnitAsTask context.CancellationToken
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
2+
3+
namespaceMicrosoft.VisualStudio.FSharp.Editor
4+
5+
openSystem
6+
openSystem.IO
7+
8+
modulePathCompletionUtilities=
9+
letGetPathThroughLastSlash(quotedPath:string,quotedPathStart:int,position:int)=
10+
letquoteLength="\"".Length
11+
letpositionInQuotedPath= position- quotedPathStart
12+
letpath= quotedPath.Substring(quoteLength, positionInQuotedPath- quoteLength).Trim()
13+
letafterLastSlashIndex=
14+
letposition= Math.Min(path.Length, path.Length-1)
15+
letindex= path.LastIndexOf(Path.DirectorySeparatorChar, position)
16+
if index>=0then index+1else-1
17+
if afterLastSlashIndex>=0then path.Substring(0, afterLastSlashIndex)else path
18+
letEndsWithQuote(quotedPath:string)=
19+
quotedPath.Length>=2&& quotedPath.[quotedPath.Length-1]='"'

‎vsintegration/src/FSharp.Editor/DocumentHighlights/DocumentHighlightsService.fs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ open System.Collections.Immutable
88
openSystem.Threading.Tasks
99

1010
openMicrosoft.CodeAnalysis
11+
openMicrosoft.CodeAnalysis.DocumentHighlighting
1112
openMicrosoft.CodeAnalysis.Editor
1213
openMicrosoft.CodeAnalysis.Host.Mef
1314
openMicrosoft.CodeAnalysis.Text

‎vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<CompileInclude="DocComments\XMLDocumentation.fs" />
6666
<CompileInclude="Completion\CompletionUtils.fs" />
6767
<CompileInclude="Completion\CompletionProvider.fs" />
68+
<CompileInclude="Completion\PathCompletionUtilities.fs" />
6869
<CompileInclude="Completion\FileSystemCompletion.fs" />
6970
<CompileInclude="Completion\CompletionService.fs" />
7071
<CompileInclude="Completion\SignatureHelp.fs" />

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -421,18 +421,19 @@ and
421421
letprojectGuid= Guid(site.ProjectGuid)
422422
letprojectFileName= site.ProjectFileName()
423423
letprojectDisplayName= projectDisplayNameOf projectFileName
424+
424425
letprojectId= workspace.ProjectTracker.GetOrCreateProjectIdForPath(projectFileName, projectDisplayName)
425426

426427
if isNull(workspace.ProjectTracker.GetProject projectId)then
427428
projectInfoManager.UpdateProjectInfo(tryGetOrCreateProjectId workspace, projectId, site, workspace, userOpName)
428429
letprojectContextFactory= package.ComponentModel.GetService<IWorkspaceProjectContextFactory>();
429430
leterrorReporter= ProjectExternalErrorReporter(projectId,"FS", this.SystemServiceProvider)
430-
431+
431432
lethierarchy=
432433
site.ProjectProvider
433434
|> Option.map(fun p-> p:?> IVsHierarchy)
434435
|> Option.toObj
435-
436+
436437
// Roslyn is expecting site to be an IVsHierarchy.
437438
// It just so happens that the object that implements IProvideProjectSite is also
438439
// an IVsHierarchy. This assertion is to ensure that the assumption holds true.
@@ -461,12 +462,7 @@ and
461462
letreferencedProjectId= workspace.ProjectTracker.GetOrCreateProjectIdForPath(referencedProjectFileName, referencedProjectDisplayName)
462463
project.AddProjectReference(ProjectReference referencedProjectId)
463464

464-
ifnot(workspace.ProjectTracker.ContainsProject(project))then
465-
workspace.ProjectTracker.AddProject(project)
466-
467-
for referencedSitein referencedProjectSitesdo
468-
setup referencedSite
469-
465+
projectId
470466
setup(siteProvider.GetProjectSite())|> ignore
471467

472468
memberthis.SetupStandAloneFile(fileName:string,fileContents:string,workspace:VisualStudioWorkspaceImpl,hier:IVsHierarchy)=

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ module internal Tokenizer =
8484
| Internal-> Glyph.EnumInternal
8585
| Protected-> Glyph.EnumProtected
8686
| Private-> Glyph.EnumPrivate
87-
| FSharpGlyph.EnumMember-> Glyph.EnumMember
87+
| FSharpGlyph.EnumMember-> Glyph.EnumMemberPublic
8888
| FSharpGlyph.Event->
8989
match accessibilitywith
9090
| Public-> Glyph.EventPublic

0 commit comments

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