← Back to branch summary

~ubuntu-branches/ubuntu/lucid/monodevelop/lucid

« back to all changes in this revision

Viewing changes to contrib/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2010-02-02 11:39:59 UTC
  • mfrom: (1.2.6 upstream) (1.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100202113959-s4exdz7er7igylz2
Tags: 2.2.1+dfsg-1
* New upstream release
* debian/control:
  + Standards version 3.8.4 (no changes needed)
* debian/patches/remove_support_for_non_debian_functionality.patch,
  debian/patches/remove_support_for_soft_debugger.patch,
  debian/patches/remove_support_for_moonlight.patch,
  debian/rules:
  + Split patch into two pieces, to make it easier to enable either
    SDB or Moonlight support with a rebuild
* debian/monodevelop-moonlight.install,
  debian/monodevelop-debugger-sdb.install,
  debian/control:
  + Create packaging data for the Soft Debugger addin and Moonlight addin -
    and comment them out of debian/control as we can't provide them on
    Debian for now

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs
2888
2888
                        if (arrayInitializerExpression.CreateExpressions.Count == 1) {
2889
2889
                                outputFormatter.Space ();
2890
2890
                        } else {
2891
 
                                outputFormatter.IndentationLevel++;
2892
 
                                outputFormatter.NewLine ();
2893
 
                                outputFormatter.Indent ();
 
2891
                                if (this.prettyPrintOptions.PlaceArrayInitializersOnNewLine == ArrayInitializerPlacement.AlwaysNewLine) {
 
2892
                                        outputFormatter.IndentationLevel++;
 
2893
                                        outputFormatter.NewLine ();
 
2894
                                        outputFormatter.Indent ();
 
2895
                                } else {
 
2896
                                        outputFormatter.Space ();
 
2897
                                }
2894
2898
                        }
2895
 
                        this.AppendCommaSeparatedList (arrayInitializerExpression.CreateExpressions, true);
 
2899
                        this.AppendCommaSeparatedList (arrayInitializerExpression.CreateExpressions, this.prettyPrintOptions.PlaceArrayInitializersOnNewLine == ArrayInitializerPlacement.AlwaysNewLine);
2896
2900
                        if (arrayInitializerExpression.CreateExpressions.Count == 1) {
2897
2901
                                outputFormatter.Space ();
2898
2902
                        } else {
2899
 
                                outputFormatter.IndentationLevel--;
2900
 
                                outputFormatter.NewLine();
2901
 
                                outputFormatter.Indent();
 
2903
                                if (this.prettyPrintOptions.PlaceArrayInitializersOnNewLine == ArrayInitializerPlacement.AlwaysNewLine) {
 
2904
                                        outputFormatter.IndentationLevel--;
 
2905
                                        outputFormatter.NewLine();
 
2906
                                        outputFormatter.Indent();
 
2907
                                } else {
 
2908
                                        outputFormatter.Space();
 
2909
                                }
2902
2910
                        }
2903
2911
                        outputFormatter.PrintToken(Tokens.CloseCurlyBrace);
2904
2912
                        return null;