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

Commit1440e76

Browse files
authored
Merge pull requestdotnet#4032 from Microsoft/merges/master-to-dev15.6-20171129-080155
Merge master to dev15.6
2 parentsa973808 +8cd1b67 commit1440e76

File tree

6 files changed

+21
-22
lines changed

6 files changed

+21
-22
lines changed

‎vsintegration/src/FSharp.Editor/Common/Constants.fs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ module internal FSharpConstants =
1818
/// "BC6DD5A5-D4D6-4dab-A00D-A51242DBAF1B"
1919
letlanguageServiceGuidString="BC6DD5A5-D4D6-4dab-A00D-A51242DBAF1B"
2020

21-
[<Literal>]
22-
/// "4EB7CCB7-4336-4FFD-B12B-396E9FD079A9"
23-
leteditorFactoryGuidString="4EB7CCB7-4336-4FFD-B12B-396E9FD079A9"
24-
2521
[<Literal>]
2622
/// "F#"
2723
letFSharpLanguageName="F#"

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -315,12 +315,6 @@ type
315315
[<ProvideLanguageExtension(typeof<FSharpLanguageService>,".fsscript")>]
316316
[<ProvideLanguageExtension(typeof<FSharpLanguageService>,".ml")>]
317317
[<ProvideLanguageExtension(typeof<FSharpLanguageService>,".mli")>]
318-
[<ProvideEditorExtension(FSharpConstants.editorFactoryGuidString,".fs",97)>]
319-
[<ProvideEditorExtension(FSharpConstants.editorFactoryGuidString,".fsi",97)>]
320-
[<ProvideEditorExtension(FSharpConstants.editorFactoryGuidString,".fsx",97)>]
321-
[<ProvideEditorExtension(FSharpConstants.editorFactoryGuidString,".fsscript",97)>]
322-
[<ProvideEditorExtension(FSharpConstants.editorFactoryGuidString,".ml",97)>]
323-
[<ProvideEditorExtension(FSharpConstants.editorFactoryGuidString,".mli",97)>]
324318
internal FSharpLanguageService(package: FSharpPackage)=
325319
inherit AbstractLanguageService<FSharpPackage, FSharpLanguageService>(package)
326320

‎vsintegration/src/FSharp.ProjectSystem.Base/Project/FSharpEditorFactory.cs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@
1616

1717
namespaceMicrosoft.VisualStudio.FSharp.ProjectSystem
1818
{
19+
// 64 represents a hex number. It needs to be greater than 37 so the TextMate editor will not be chosen as higher priority.
1920
[Guid(Constants.FSharpEditorFactoryIdString)]
2021
[ProvideEditorFactory(typeof(FSharpEditorFactory),101,CommonPhysicalViewAttributes=(int)__VSPHYSICALVIEWATTRIBUTES.PVA_SupportsPreview)]
21-
[ProvideEditorExtension(typeof(FSharpEditorFactory),".fs",32)]
22-
[ProvideEditorExtension(typeof(FSharpEditorFactory),".fsi",32)]
23-
[ProvideEditorExtension(typeof(FSharpEditorFactory),".fsscript",32)]
24-
[ProvideEditorExtension(typeof(FSharpEditorFactory),".fsx",32)]
22+
[ProvideEditorExtension(typeof(FSharpEditorFactory),".fs",64)]
23+
[ProvideEditorExtension(typeof(FSharpEditorFactory),".fsi",64)]
24+
[ProvideEditorExtension(typeof(FSharpEditorFactory),".fsscript",64)]
25+
[ProvideEditorExtension(typeof(FSharpEditorFactory),".fsx",64)]
26+
[ProvideEditorExtension(typeof(FSharpEditorFactory),".ml",64)]
27+
[ProvideEditorExtension(typeof(FSharpEditorFactory),".mli",64)]
2528
publicclassFSharpEditorFactory:IVsEditorFactory
2629
{
2730
privatePackage_parentPackage;

‎vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectNode.cs‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,8 @@ public abstract partial class ProjectNode : HierarchyNode,
306306
IReferenceContainerProvider,
307307
IVsProjectSpecialFiles,
308308
IVsDesignTimeAssemblyResolution,
309-
IVsProjectUpgrade
309+
IVsProjectUpgrade,
310+
IVsSupportItemHandoff
310311
{
311312
/// <summary>
312313
/// This class stores mapping from ids -> objects. Uses as a replacement of EventSinkCollection (ESC)
@@ -5398,10 +5399,6 @@ public virtual int TransferItem(string oldMkDoc, string newMkDoc, IVsWindowFrame
53985399
if(oldMkDoc==null||newMkDoc==null)
53995400
returnVSConstants.E_INVALIDARG;
54005401

5401-
// Fail if the document names passed are equal.
5402-
if(oldMkDoc==newMkDoc)
5403-
returnVSConstants.E_INVALIDARG;
5404-
54055402
inthr=VSConstants.S_OK;
54065403
VSDOCUMENTPRIORITY[]priority=newVSDOCUMENTPRIORITY[1];
54075404
uintitemid=VSConstants.VSITEMID_NIL;
@@ -6614,6 +6611,16 @@ private T GetOuterAs<T>()
66146611
}
66156612
returnhierarchy;
66166613
}
6614+
6615+
publicintHandoffItem(uintitemid,IVsProject3pProjDest,stringpszMkDocumentOld,stringpszMkDocumentNew,IVsWindowFramepunkWindowFrame)
6616+
{
6617+
if(pProjDest==null)
6618+
{
6619+
returnVSConstants.E_POINTER;
6620+
}
6621+
6622+
returnpProjDest.TransferItem(pszMkDocumentOld,pszMkDocumentNew,punkWindowFrame);
6623+
}
66176624
}
66186625
internalenumAddItemContext
66196626
{

‎vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,7 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem
15931593
// in the registry hive so that more editors can be added without changing this part of the
15941594
// code. FSharp only makes usage of one Editor Factory and therefore we will return
15951595
// that guid
1596-
guidEditorType<-new Guid(FSharpConstants.editorFactoryGuidString)
1596+
guidEditorType<-new Guid(Constants.FSharpEditorFactoryIdString)
15971597
VSConstants.S_OK
15981598

15991599
interface IVsProjectSpecificEditorMap2with
@@ -1607,7 +1607,7 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem
16071607
// in the registry hive so that more editors can be added without changing this part of the
16081608
// code. FSharp only makes usage of one Editor Factory and therefore we will return
16091609
// that guid
1610-
guidEditorType<-new Guid(FSharpConstants.editorFactoryGuidString)
1610+
guidEditorType<-new Guid(Constants.FSharpEditorFactoryIdString)
16111611
VSConstants.S_OK
16121612

16131613
memberx.GetSpecificLanguageService(_mkDocument:string,guidLanguageService:byref<Guid>)=

‎vsintegration/src/FSharp.VS.FSI/fsiCommands.vsct‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@
249249
<!-- GuidSymbol name="guidFsiPkg" value="{eeeeeeee-9342-42f1-8ea9-42f0e8a6be55}" /--><!-- fsi package guid-->
250250
<GuidSymbolname="guidFsiPkg"value="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" /><!-- project system guid-->
251251

252-
<GuidSymbolname="guidEditorFactory"value="{4EB7CCB7-4336-4FFD-B12B-396E9FD079A9}" /><!-- Linked to constants in project system-->
253252
<GuidSymbolname="guidFSharpEditorFactory"value="{8a5aa6cf-46e3-4520-a70a-7393d15233e9}" /><!-- FSharpEditorFactory Guid-->
254253
<GuidSymbolname="GUID_CMDSETID_StandardCommandSet2K"value="{1496A755-94DE-11D0-8C3F-00C04FC2AAE2}" /><!-- See stdidcmd.h-->
255254
<GuidSymbolname="guidFsiToolWindow"value="{dee22b65-9761-4a26-8fb2-759b971d6dfc}" />

0 commit comments

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