Merge branch 'master' of github.com:icsharpcode/SharpDevelop

src/AddIns/BackendBindings/VBNetBinding/Test/CodeCompletionTests.cs

@@ -119,5 +119,21 @@ End Module";
 			
 			TestCtrlSpace(text, true, list => Assert.IsFalse(list.Items.Any(i => i.Text == "InnerException")));
 		}
+		
+		[Test]
+		public void TestLocalVariablesAvailableAtEndOfForLoop()
+		{
+			string text = @"Module Test
+	Public Sub f()
+		Dim cheeses = { ""cheddar"", ""brie"", ""edam"" }
+		For Each cheese As String In cheeses
+			Dim gouda = ""is tasty""
+			|
+		Next
+   End Sub
+End Module";
+			
+			TestKeyPress(text, 'g', CodeCompletionKeyPressResult.CompletedIncludeKeyInCompletion, list => Assert.IsTrue(list.Items.Any(i => i.Text == "gouda")));
+		}
 	}
 }

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/ModelTools.cs

@@ -37,6 +37,7 @@ namespace ICSharpCode.WpfDesign.Designer
 						return 0;
 					}
 				}
+				tmp = tmp.Parent;
 			}
 			return 0;
 		}

src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG

@@ -3014,7 +3014,9 @@ Block<out Statement stmt>
 	}
 	(.
 		stmt = blockStmt;
-		if (t != null) blockStmt.EndLocation = t.EndLocation;
+		// Use start of 'End'/'Next' keyword, not the end of the previous statement
+		// this is necessary to have local variables available for code completion (CodeCompletionTests.TestLocalVariablesAvailableAtEndOfForLoop)
+		if (la != null) blockStmt.EndLocation = la.Location;
 		BlockEnd();
 	.)
 .

src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.xaml.cs

@@ -137,6 +137,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 			} else {
 				applicationManifestComboBox.Text = this.ApplicationManifest.Value;
 			}
+			this.projectInformation.OutputTypeName = AssemblyName.Value + CompilableProject.GetExtension(OutputType.Value);
 			IsDirty = false;
 		}
 		

src/Main/Base/Project/Src/Project/AbstractProject.cs

@@ -132,7 +132,8 @@ namespace ICSharpCode.SharpDevelop.Project
 					return ((FileAttributes.ReadOnly & attributes) == FileAttributes.ReadOnly);
 				} catch (FileNotFoundException) {
 					return false;
-				} catch (DirectoryNotFoundException) {
+				} catch (IOException) {
+					// directory not found, network path not available, etc.
 					return true;
 				}
 			}