Browse Source

Fixed tests

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5678 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Daniel Grunwald 15 years ago
parent
commit
05660f70af
  1. 2
      src/Libraries/NRefactory/Project/Src/Lexer/AbstractLexer.cs
  2. 15
      src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionDataUsageCache.cs

2
src/Libraries/NRefactory/Project/Src/Lexer/AbstractLexer.cs

@ -23,7 +23,6 @@ namespace ICSharpCode.NRefactory.Parser @@ -23,7 +23,6 @@ namespace ICSharpCode.NRefactory.Parser
int col = 1;
int line = 1;
[CLSCompliant(false)]
protected Errors errors = new Errors();
protected Token lastToken = null;
@ -34,7 +33,6 @@ namespace ICSharpCode.NRefactory.Parser @@ -34,7 +33,6 @@ namespace ICSharpCode.NRefactory.Parser
protected Hashtable specialCommentHash = null;
List<TagComment> tagComments = new List<TagComment>();
protected StringBuilder sb = new StringBuilder();
[CLSCompliant(false)]
protected SpecialTracker specialTracker = new SpecialTracker();
// used for the original value of strings (with escape sequences).

15
src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionDataUsageCache.cs

@ -51,7 +51,10 @@ namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion @@ -51,7 +51,10 @@ namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion
public static string CacheFilename {
get {
return Path.Combine(PropertyService.ConfigDirectory, "CodeCompletionUsageCache.dat");
if (string.IsNullOrEmpty(PropertyService.ConfigDirectory))
return null;
else
return Path.Combine(PropertyService.ConfigDirectory, "CodeCompletionUsageCache.dat");
}
}
@ -59,9 +62,10 @@ namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion @@ -59,9 +62,10 @@ namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion
{
dict = new Dictionary<string, UsageStruct>();
ProjectService.SolutionClosed += delegate(object sender, EventArgs e) { SaveCache(); };
if (!File.Exists(CacheFilename))
string cacheFileName = CodeCompletionDataUsageCache.CacheFilename;
if (string.IsNullOrEmpty(cacheFileName) || !File.Exists(cacheFileName))
return;
using (FileStream fs = new FileStream(CacheFilename, FileMode.Open, FileAccess.Read)) {
using (FileStream fs = new FileStream(cacheFileName, FileMode.Open, FileAccess.Read)) {
using (BinaryReader reader = new BinaryReader(fs)) {
if (reader.ReadInt64() != magic) {
LoggingService.Warn("CodeCompletionDataUsageCache: wrong file magic");
@ -91,11 +95,12 @@ namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion @@ -91,11 +95,12 @@ namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion
public static void SaveCache()
{
if (dict == null) {
string cacheFileName = CodeCompletionDataUsageCache.CacheFilename;
if (dict == null || string.IsNullOrEmpty(cacheFileName)) {
return;
}
int count;
using (FileStream fs = new FileStream(CacheFilename, FileMode.Create, FileAccess.Write)) {
using (FileStream fs = new FileStream(cacheFileName, FileMode.Create, FileAccess.Write)) {
using (BinaryWriter writer = new BinaryWriter(fs)) {
count = SaveCache(writer);
}

Loading…
Cancel
Save