Skip to content

Commit 470b850

Browse files
sushihangoversushihangover
committed
Compiling against MS/XS 5.10.2.49.
More changes to go till Intellisense and ... are working properly
1 parent 8a32fec commit 470b850

86 files changed

Lines changed: 921 additions & 1097 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
packages/
2-
2+
bin
3+
obj
4+
.DS_Store
5+
*userprefs

‎.gitmodules‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,9 @@
77
[submodule "external/ikvm"]
88
path = external/ikvm
99
url = https://github.com/mono/ikvm-fork
10+
[submodule "external/cecil"]
11+
path = external/cecil
12+
url = https://www.github.com/jbevain/cecil.git
13+
[submodule "external/Nrefactory-upstream"]
14+
path = external/Nrefactory-upstream
15+
url = https://github.com/icsharpcode/NRefactory.git

‎PlayBinding/MonoDevelop.CSharp.CodeGeneration/AbstractGenerateAction.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
using System.Collections.Generic;
3232
using MonoDevelop.Refactoring;
3333
using MonoDevelop.Ide;
34-
using ICSharpCode.NRefactory.TypeSystem;
3534
using MonoDevelop.Ide.TypeSystem;
3635
using MonoDevelop.Components;
36+
using ICSharpCode.NRefactory.TypeSystem;
3737

3838
namespace MonoDevelop.PlayScript.CodeGeneration
3939
{

‎PlayBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
using System.Linq;
2727
using MonoDevelop.Ide.Gui;
2828
using MonoDevelop.Ide;
29-
using ICSharpCode.NRefactory.TypeSystem;
30-
using ICSharpCode.NRefactory.CSharp;
31-
using ICSharpCode.NRefactory.CSharp.TypeSystem;
3229
using MonoDevelop.Ide.TypeSystem;
3330
using MonoDevelop.Core;
34-
using ICSharpCode.NRefactory.CSharp.Resolver;
3531
using System;
3632
using System.Threading;
33+
using ICSharpCode.NRefactory.TypeSystem;
34+
using ICSharpCode.NRefactory.PlayScript;
35+
using ICSharpCode.NRefactory.PlayScript.TypeSystem;
36+
using ICSharpCode.NRefactory.PlayScript.Resolver;
3737

3838
namespace MonoDevelop.PlayScript.CodeGeneration
3939
{
@@ -139,7 +139,7 @@ public AstType CreateShortType (IType fullType)
139139
fullType = compilation.Import (fullType);
140140
var csResolver = parsedFile.GetResolver (compilation, Document.Editor.Caret.Location);
141141

142-
var builder = new ICSharpCode.NRefactory.CSharp.Refactoring.TypeSystemAstBuilder (csResolver);
142+
var builder = new ICSharpCode.NRefactory.PlayScript.Refactoring.TypeSystemAstBuilder (csResolver);
143143
return builder.ConvertType (fullType);
144144
}
145145

‎PlayBinding/MonoDevelop.CSharp.CodeGeneration/CreateConstructorGenerator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626

2727
using Gtk;
2828
using System.Collections.Generic;
29-
using ICSharpCode.NRefactory.CSharp;
3029
using MonoDevelop.Core;
31-
using ICSharpCode.NRefactory.TypeSystem;
3230
using System.Linq;
31+
using ICSharpCode.NRefactory.PlayScript;
32+
using ICSharpCode.NRefactory.TypeSystem;
3333

3434
namespace MonoDevelop.PlayScript.CodeGeneration
3535
{

‎PlayBinding/MonoDevelop.CSharp.CodeGeneration/EqualityMembersGenerator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
// THE SOFTWARE.
2626

2727
using System.Collections.Generic;
28-
using ICSharpCode.NRefactory.CSharp;
2928
using MonoDevelop.Core;
3029
using ICSharpCode.NRefactory.TypeSystem;
30+
using ICSharpCode.NRefactory.PlayScript;
3131

3232
namespace MonoDevelop.PlayScript.CodeGeneration
3333
{

‎PlayBinding/MonoDevelop.CSharp.CodeGeneration/ExportCodeGenerator.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@
2525
// THE SOFTWARE.
2626
using Gtk;
2727
using System.Collections.Generic;
28-
using ICSharpCode.NRefactory.CSharp;
28+
using ICSharpCode.NRefactory.PlayScript;
2929
using MonoDevelop.Core;
3030
using ICSharpCode.NRefactory.TypeSystem;
3131
using System.Linq;
32-
using ICSharpCode.NRefactory.CSharp.Refactoring;
32+
using ICSharpCode.NRefactory.PlayScript.Refactoring;
3333
using MonoDevelop.PlayScript.Refactoring.CodeActions;
34-
using MonoDevelop.CodeGeneration;
34+
//using MonoDevelop.CodeGeneration;
3535
using MonoDevelop.PlayScript.Completion;
36+
using MonoDevelop.PlayScript;
3637

3738
namespace MonoDevelop.PlayScript.CodeGeneration
3839
{

‎PlayBinding/MonoDevelop.CSharp.CodeGeneration/ImplementInterfaceMembersGenerator.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
using System.Collections.Generic;
2828
using MonoDevelop.Core;
2929
using MonoDevelop.Refactoring;
30-
using ICSharpCode.NRefactory.CSharp;
31-
using ICSharpCode.NRefactory.TypeSystem;
3230
using MonoDevelop.Ide.TypeSystem;
3331
using System;
32+
using ICSharpCode.NRefactory.PlayScript;
33+
using ICSharpCode.NRefactory.TypeSystem;
3434

3535
namespace MonoDevelop.PlayScript.CodeGeneration
3636
{
@@ -82,7 +82,7 @@ protected override IEnumerable<object> GetValidMembers ()
8282
if (baseType.Kind != TypeKind.Interface)
8383
continue;
8484
bool ifm;
85-
foreach (var t in ICSharpCode.NRefactory.CSharp.Refactoring.ImplementInterfaceAction.CollectMembersToImplement (type, baseType, false, out ifm)) {
85+
foreach (var t in ICSharpCode.NRefactory.PlayScript.Refactoring.ImplementInterfaceAction.CollectMembersToImplement (type, baseType, false, out ifm)) {
8686
yield return t;
8787
}
8888
}

‎PlayBinding/MonoDevelop.CSharp.CodeGeneration/OverrideMembersGenerator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
using System.Collections.Generic;
2929
using MonoDevelop.Core;
3030
using MonoDevelop.Refactoring;
31-
using ICSharpCode.NRefactory.CSharp;
32-
using ICSharpCode.NRefactory.TypeSystem;
3331
using MonoDevelop.Ide.TypeSystem;
32+
using ICSharpCode.NRefactory.PlayScript;
33+
using ICSharpCode.NRefactory.TypeSystem;
3434

3535
namespace MonoDevelop.PlayScript.CodeGeneration
3636
{

‎PlayBinding/MonoDevelop.CSharp.CodeGeneration/PartialGenerator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
using System;
2727
using System.Collections.Generic;
2828
using Gtk;
29-
using ICSharpCode.NRefactory.TypeSystem;
3029
using MonoDevelop.Core;
3130
using MonoDevelop.Ide.TypeSystem;
31+
using ICSharpCode.NRefactory.TypeSystem;
3232

3333
namespace MonoDevelop.PlayScript.CodeGeneration
3434
{

0 commit comments

Comments
 (0)