Changeset 8085 for branches/GP-MoveOperators/HeuristicLab.CodeEditor/3.3/CodeCompletionProvider.cs

Timestamp:

06/21/12 18:02:33 (12 years ago)

Author:

gkronber

Message:

#1847: merged trunk changes r7800:HEAD into gp move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (2 props)
• HeuristicLab.CodeEditor/3.3/CodeCompletionProvider.cs (modified) (1 diff)

branches/GP-MoveOperators

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

branches/GP-MoveOperators/HeuristicLab.CodeEditor/3.3/CodeCompletionProvider.cs

@@ -92 +92 @@
       List<ICompletionData> resultList = new List<ICompletionData>();
       if (rr != null) {
-        ArrayList completionData = rr.GetCompletionData(codeEditor.projectContent);
-        if (completionData != null) {
-          AddCompletionData(resultList, completionData);
-        }
+        try {
+          ArrayList completionData = rr.GetCompletionData(codeEditor.projectContent);
+          if (completionData != null) {
+            AddCompletionData(resultList, completionData);
+          }
+        } catch (NullReferenceException x) { }
       }
       return resultList.ToArray();

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests