[vala/wip/ricotz/lsp: 1/4] MERGE code-style fixes

[Rico Tzschichholz <ricotz src gnome org>]

commit 3eb2ac5166c30e890b3cb3c57707cb79b095c8c9
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Thu Jan 9 18:13:27 2020 +0100

    MERGE code-style fixes

 vala/valabinaryexpression.vala | 4 ++--
 vala/valamethodcall.vala       | 4 ++--
 vala/valaparameter.vala        | 2 +-
 vala/valaparser.vala           | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/vala/valabinaryexpression.vala b/vala/valabinaryexpression.vala
index 8396b6947..6478621f4 100644
--- a/vala/valabinaryexpression.vala
+++ b/vala/valabinaryexpression.vala
@@ -549,8 +549,8 @@ public class Vala.BinaryExpression : Expression {
                        break;
                case BinaryOperator.IN:
                        if (left.value_type.compatible (context.analyzer.int_type)
-                                       && right.value_type != null
-                                       && right.value_type.compatible (context.analyzer.int_type)) {
+                           && right.value_type != null
+                           && right.value_type.compatible (context.analyzer.int_type)) {
                                // integers or enums
                                left.target_type.nullable = false;
                                right.target_type.nullable = false;
diff --git a/vala/valamethodcall.vala b/vala/valamethodcall.vala
index 0673e0001..98ad23962 100644
--- a/vala/valamethodcall.vala
+++ b/vala/valamethodcall.vala
@@ -487,8 +487,8 @@ public class Vala.MethodCall : Expression {
                foreach (Expression arg in argument_list) {
                        arg.check (context);
 
-                       if (arg is LambdaExpression && ((LambdaExpression) arg).method != null &&
-                                       ((LambdaExpression) arg).method.closure) {
+                       if (arg is LambdaExpression && ((LambdaExpression) arg).method != null
+                           && ((LambdaExpression) arg).method.closure) {
                                force_lambda_method_closure = true;
                        }
                }
diff --git a/vala/valaparameter.vala b/vala/valaparameter.vala
index 7d64c17f6..dd4d6fcba 100644
--- a/vala/valaparameter.vala
+++ b/vala/valaparameter.vala
@@ -177,7 +177,7 @@ public class Vala.Parameter : Variable {
                        } else if (!(initializer is NullLiteral) && direction == ParameterDirection.OUT) {
                                Report.error (source_reference, "only `null' is allowed as default value for 
out parameters");
                        } else if (direction == ParameterDirection.IN && (initializer.value_type == null || 
!initializer.value_type.compatible (variable_type))) {
-                               Report.error (initializer.source_reference, "Cannot convert from `%s' to 
`%s'".printf (initializer.value_type == null ? "(nil)" : initializer.value_type.to_string (), 
variable_type.to_string ()));
+                               Report.error (initializer.source_reference, "Cannot convert from `%s' to 
`%s'".printf (initializer.value_type == null ? "(null)" : initializer.value_type.to_string (), 
variable_type.to_string ()));
                        } else if (direction == ParameterDirection.REF) {
                                Report.error (source_reference, "default value not allowed for ref 
parameter");
                        } else if (!initializer.is_accessible (this)) {
diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index 243e6345c..95b9fece0 100644
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -957,11 +957,11 @@ public class Vala.Parser : CodeVisitor {
                foreach (Expression arg in arg_list) {
                        expr.add_argument (arg);
                }
-                expr.initial_argument_count = arg_list.size;
+               expr.initial_argument_count = arg_list.size;
                foreach (MemberInitializer initializer in init_list) {
                        expr.add_member_initializer (initializer);
                }
-                expr.extra_comma = extra_comma;
+               expr.extra_comma = extra_comma;
                return expr;
        }