crystal-lang · Nov 23, 2016 · Nov 23, 2016 · Nov 23, 2016
diff --git a/spec/compiler/formatter/formatter_spec.cr b/spec/compiler/formatter/formatter_spec.cr
@@ -981,4 +981,6 @@ describe Crystal::Formatter do
   assert_format "1 +\n  # foo\n  2"
   assert_format "1 ||\n  # foo\n  2"
   assert_format "foo(1 ||\n    # foo\n    2)"
+
+  assert_format "x = a do\n  1 ||\n    2\nend"
 end
diff --git a/src/compiler/crystal/tools/doc/markdown_doc_renderer.cr b/src/compiler/crystal/tools/doc/markdown_doc_renderer.cr
@@ -46,9 +46,9 @@ class Crystal::Doc::MarkdownDocRenderer < Markdown::HTMLRenderer
 
     # Check Type#method(...) or Type or #method(...)
     text = text.gsub /\b
-      ([A-Z]\w+(?:\:\:[A-Z]\w+)?(?:\#|\.)(?:\w|\<|\=|\>|\+|\-|\*|\/|\[|\]|\&|\||\?|\!|\^|\~)+(?:\?|\!)?(?:\(.+?\))?)
+      ((?:\:\:)?[A-Z]\w+(?:\:\:[A-Z]\w+)?(?:\#|\.)(?:\w|\<|\=|\>|\+|\-|\*|\/|\[|\]|\&|\||\?|\!|\^|\~)+(?:\?|\!)?(?:\(.+?\))?)
         |
-      ([A-Z]\w+(?:\:\:[A-Z]\w+)?)
+      ((?:\:\:)?[A-Z]\w+(?:\:\:[A-Z]\w+)?)
         |
       ((?:\#|\.)(?:\w|\<|\=|\>|\+|\-|\*|\/|\[|\]|\&|\||\?|\!|\^|\~)+(?:\?|\!)?(?:\(.+?\))?)
       /x do |match_text, match|
@@ -71,7 +71,7 @@ class Crystal::Doc::MarkdownDocRenderer < Markdown::HTMLRenderer
           method_args = ""
         end
 
-        another_type = @type.lookup_path(type_name.split("::"))
+        another_type = @type.lookup_path(type_name)
         if another_type && @type.must_be_included?
           method = lookup_method another_type, method_name, method_args, kind
           if method
@@ -82,7 +82,7 @@ class Crystal::Doc::MarkdownDocRenderer < Markdown::HTMLRenderer
 
       # Type
       if match[2]?
-        another_type = @type.lookup_path(match_text.split("::"))
+        another_type = @type.lookup_path(match_text)
         if another_type && another_type.must_be_included?
           next type_link another_type, match_text
         end

diff --git a/src/compiler/crystal/tools/doc/type.cr b/src/compiler/crystal/tools/doc/type.cr
@@ -393,13 +393,20 @@ class Crystal::Doc::Type
     @type.doc
   end
 
-  def lookup_path(path_or_names)
+  def lookup_path(path_or_names : Path | Array(String))
     match = @type.lookup_path(path_or_names)
     return unless match.is_a?(Crystal::Type)
 
     @generator.type(match)
   end
 
+  def lookup_path(full_path : String)
+    global = full_path.starts_with?("::")
+    full_path = full_path[2..-1] if global
+    path = Path.new(full_path.split("::"), global: global)
+    lookup_path(path)
+  end
+
   def lookup_method(name)
     lookup_in_methods instance_methods, name
   end

diff --git a/src/compiler/crystal/tools/formatter.cr b/src/compiler/crystal/tools/formatter.cr
@@ -2468,6 +2468,8 @@ module Crystal
     def format_block(node, needs_space)
       needs_comma = false
       @dot_column = nil
+      old_inside_call_or_assign = @inside_call_or_assign
+      @inside_call_or_assign = 0
 
       if @token.type == :","
         needs_comma = true
@@ -2603,6 +2605,8 @@ module Crystal
           raise "Bug: expected Call, IsA or RespondsTo as &. argument, at #{node.location}, not #{body.class}"
         end
       end
+
+      @inside_call_or_assign = old_inside_call_or_assign
     end
 
     def clear_object(node)

diff --git a/src/compiler/crystal/tools/init/template/shard.yml.ecr b/src/compiler/crystal/tools/init/template/shard.yml.ecr
@@ -10,6 +10,6 @@ targets:
     main: src/<%= config.name %>.cr
 <%- end -%>
 
-crystal: <%= Crystal::VERSION %>
+crystal: <%= Crystal::Config.version %>
 
 license: MIT