[svn] r5910: corsavy-addin/trunk: NemerleBinding.addin Src/FormattingStrategy/NemerleFormattingStrategy.cs

[malekith]

Log:
Enable formatting strategy. Disable unused publication tab.

Author: malekith
Date: Mon Nov  7 17:09:00 2005
New Revision: 5910

Modified:
   corsavy-addin/trunk/NemerleBinding.addin
   corsavy-addin/trunk/Src/FormattingStrategy/NemerleFormattingStrategy.cs

Modified: corsavy-addin/trunk/NemerleBinding.addin
==============================================================================
--- corsavy-addin/trunk/NemerleBinding.addin	(original)
+++ corsavy-addin/trunk/NemerleBinding.addin	Mon Nov  7 17:09:00 2005
@@ -58,16 +58,16 @@
 		<DialogPanel id    = "DebugOptions"
 		             label = "${res:Dialog.ProjectOptions.DebugOptions}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
+			     <!--
 		<DialogPanel id    = "Publish"
 		             label = "${res:Dialog.ProjectOptions.Publish}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Publish"/>
+			     -->
 	</Path>
 	
-	<!--
 	<Path name = "/AddIns/DefaultTextEditor/Formatter/Nemerle">
 		<Class id ="NemerleFormatter" class = "NemerleBinding.FormattingStrategy.NemerleFormattingStrategy"/>
 	</Path>
-	-->
 	
 	<Path name = "/Workspace/Icons">
 		<!-- Nemerle -->

Modified: corsavy-addin/trunk/Src/FormattingStrategy/NemerleFormattingStrategy.cs
==============================================================================
--- corsavy-addin/trunk/Src/FormattingStrategy/NemerleFormattingStrategy.cs	(original)
+++ corsavy-addin/trunk/Src/FormattingStrategy/NemerleFormattingStrategy.cs	Mon Nov  7 17:09:00 2005
@@ -156,11 +156,6 @@
 							inString = !inString;
 						}
 						break;
-					case '\'':
-						if (!(inString || lineComment || blockComment)) {
-							inChar = !inChar;
-						}
-						break;
 					case '{':
 						if (!(inString || inChar || lineComment || blockComment)) {
 							++curlyCounter;
@@ -668,11 +663,6 @@
 							inString = !inString;
 						}
 						break;
-					case '\'':
-						if (!(inString || lineComment || blockComment)) {
-							inChar = !inChar;
-						}
-						break;
 					case '\\':
 						if ((inString && !verbatim) || inChar)
 							++i; // skip next character
@@ -762,11 +752,6 @@
 							inString = !inString;
 						}
 						break;
-					case '\'':
-						if (!(inString || lineComment || blockComment)) {
-							inChar = !inChar;
-						}
-						break;
 					case '\\':
 						if ((inString && !verbatim) || inChar)
 							++offset; // skip next character