pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed build. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3765 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
02d3d085d2
commit
a8dd913eb1
3 changed files with 22 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/AddIns/BackendBindings/Boo/BooBinding/Test/ResolverTests.cs
  2. 42
      src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/NRefactoryRefactoringProviderTests.cs
  3. 5
      src/Main/StartUp/Project/app.template.config

2
src/AddIns/BackendBindings/Boo/BooBinding/Test/ResolverTests.cs
Unescape View File

@ -59,7 +59,7 @@ namespace Grunwald.BooBinding.Tests @@ -59,7 +59,7 @@ namespace Grunwald.BooBinding.Tests
pc.ReferencedContents.Add(booLangPC);
ICompilationUnit cu = new BooParser().Parse(pc, fileName, prog);
ParserService.RegisterParseInformation(fileName, cu);
cu.Classes.Foreach(pc.AddClassToNamespaceList);
cu.Classes.ForEach(pc.AddClassToNamespaceList);
}
void GetPos(string prog, string marker, out int line, out int column)

42
src/Main/ICSharpCode.SharpDevelop.Dom/Tests/ICSharpCode.SharpDevelop.Dom.Tests/NRefactoryRefactoringProviderTests.cs
Unescape View File

@ -151,12 +151,8 @@ namespace ExtractInterfaceImplicitPropertyTest { @@ -151,12 +151,8 @@ namespace ExtractInterfaceImplicitPropertyTest {
string sourceClassName = c.Name;
string sourceNamespace = c.Namespace;
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(interfaceName,
membersToExtract,
false,
sourceNamespace,
sourceClassName,
fileContent);
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(
interfaceName, fileContent, membersToExtract, c, false);
ICompilationUnit icu = helper.Parse(TestClass.FileName, interfaceCode);
IClass i = icu.Classes[0];
@ -206,12 +202,8 @@ namespace ExtractInterfaceImplicitPropertyTest { @@ -206,12 +202,8 @@ namespace ExtractInterfaceImplicitPropertyTest {
string sourceClassName = c.Name;
string sourceNamespace = c.Namespace;
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(interfaceName,
membersToExtract,
false,
sourceNamespace,
sourceClassName,
fileContent);
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(
interfaceName, fileContent, membersToExtract, c, false);
ICompilationUnit icu = helper.Parse(TestClass.FileName, interfaceCode);
IClass i = icu.Classes[0];
@ -265,12 +257,8 @@ namespace ExtractInterfaceImplicitPropertyTest { @@ -265,12 +257,8 @@ namespace ExtractInterfaceImplicitPropertyTest {
string sourceClassName = c.Name;
string sourceNamespace = c.Namespace;
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(interfaceName,
membersToExtract,
false,
sourceNamespace,
sourceClassName,
fileContent);
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(
interfaceName, fileContent, membersToExtract, c, false);
ICompilationUnit icu = helper.Parse(ITestClass.FileName, interfaceCode);
IClass i = icu.Classes[0];
@ -331,12 +319,8 @@ namespace ExtractInterfaceImplicitPropertyTest { @@ -331,12 +319,8 @@ namespace ExtractInterfaceImplicitPropertyTest {
string sourceClassName = c.Name;
string sourceNamespace = c.Namespace;
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(interfaceName,
membersToExtract,
false,
sourceNamespace,
sourceClassName,
fileContent);
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(
interfaceName, fileContent, membersToExtract, c, false);
ICompilationUnit icu = helper.Parse(ITestClass.FileName, interfaceCode);
IClass i = icu.Classes[0];
@ -354,6 +338,8 @@ namespace ExtractInterfaceImplicitPropertyTest { @@ -354,6 +338,8 @@ namespace ExtractInterfaceImplicitPropertyTest {
}
[Test]
[Ignore("This test is not necessary: we shouldn't require that GenerateInterfaceForClass ignores static methods, " +
"they cannot be selected as memberToExtract in the UI anyways.")]
public void GenerateInterfaceWithStaticMethodsTest() {
string fileContent = @"
using System;
@ -390,12 +376,8 @@ namespace ExtractInterfaceImplicitPropertyTest { @@ -390,12 +376,8 @@ namespace ExtractInterfaceImplicitPropertyTest {
string sourceClassName = c.Name;
string sourceNamespace = c.Namespace;
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(interfaceName,
membersToExtract,
false,
sourceNamespace,
sourceClassName,
fileContent);
string interfaceCode = csharpRefactoringProvider.GenerateInterfaceForClass(
interfaceName, fileContent, membersToExtract, c, false);
ICompilationUnit icu = helper.Parse(ITestClass.FileName, interfaceCode);
IClass i = icu.Classes[0];

5
src/Main/StartUp/Project/app.template.config
Unescape View File

@ -70,6 +70,7 @@ @@ -70,6 +70,7 @@
<!-- <add key="domPersistencePath" value="none" /> -->
</appSettings>
<log4net>
<!-- Writes to the console. The console is only visible in debug builds of SharpDevelop. -->
<appender name="ColoredConsoleAppender" type="log4net.Appender.ColoredConsoleAppender">
<mapping>
<level value="FATAL" />
@ -96,12 +97,14 @@ @@ -96,12 +97,14 @@
</layout>
</appender>
<!-- Writes to OutputDebugString - use a tool like Sysinternals DebugView to view the log -->
<appender name="DebugAppender" type="log4net.Appender.OutputDebugStringAppender">
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%thread] %-5level- %message%newline" />
</layout>
</appender>
<!-- Allows writing to a log file -->
<appender name="FileAppender" type="log4net.Appender.FileAppender">
<file value="SharpDevelopLog.txt" />
<layout type="log4net.Layout.PatternLayout">
@ -109,12 +112,14 @@ @@ -109,12 +112,14 @@
</layout>
</appender>
<!--- Keeps the last few log entries and appends them to bug reports when an exception occurs -->
<appender name="Recorder" type="ICSharpCode.SharpDevelop.Sda.LogMessageRecorder, ICSharpCode.SharpDevelop.Sda">
<bufferSize value="25" />
</appender>
<root>
<level value="DEBUG" />
<!-- Here you can configure which log appenders should be used -->
<appender-ref ref="ColoredConsoleAppender" />
<appender-ref ref="Recorder" />
</root>

Write Preview
Loading…
Cancel
Save