Merge remote-tracking branch 'upstream/develop' into develop

merge upsteam

modules/lang/csharp/config.el

@@ -7,6 +7,26 @@
   (set-rotate-patterns! 'csharp-mode
     :symbols '(("public" "protected" "private")
                ("class" "struct")))
+  (set-ligatures! 'csharp-mode
+    ;; Functional
+    :lambda        "() =>"
+    ;; Types
+    :null          "null"
+    :true          "true"
+    :false         "false"
+    :int           "int"
+    :float         "float"
+    :str           "string"
+    :bool          "bool"
+    :list          "List"
+    ;; Flow
+    :not           "!"
+    :in            "in"
+    :and           "&&"
+    :or            "||"
+    :for           "for"
+    :return        "return"
+    :yield         "yield")
 
   (sp-local-pair 'csharp-mode "<" ">"
                  :when '(+csharp-sp-point-in-type-p)