src: use `as_notnullable` in code

[nit.git] / src / highlight.nit
diff --git a/src/highlight.nit b/src/highlight.nit

index fbe013e..bfa0d0f 100644 (file)
--- a/src/highlight.nit
+++ b/src/highlight.nit
@@ -200,6 +200,22 @@ pre.nitcode .line:hover{ background-color: #FFFFE0; } /* current line */
  .popover { max-width: 800px !important; }
  """
         end
+
+       # Additional content to inject in the <head> tag
+       # Note: does not include `css_content`; handle it yourself.
+       fun head_content: String
+       do
+               return """<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">\n"""
+       end
+
+       # Additional content to inject just before the closing </body> tag
+       fun foot_content: String
+       do
+               return """
+<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
+<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+<script>$(".popupable").popover({html:true, placement:'top'})/*initialize bootstrap popover*/</script>"""
+       end
  end
  
  redef class HTMLTag
@@ -537,6 +553,7 @@ redef class Variable
         super HInfoBoxable
         redef fun infobox(v)
         do
+               var declared_type = self.declared_type
                 if declared_type == null then
                         var res = new HInfoBox(v, "{name}")
                         res.new_field("local var").append("{name}")
@@ -650,9 +667,9 @@ end
  redef class AVarFormExpr
         redef fun decorate_tag(v, res, token)
         do
-               res.add_class("nc_v")
                 var variable = self.variable
                 if variable == null then return null
+               res.add_class("nc_v")
                 return variable.infobox(v)
         end
  end
@@ -660,9 +677,9 @@ end
  redef class AVardeclExpr
         redef fun decorate_tag(v, res, token)
         do
-               res.add_class("nc_v")
                 var variable = self.variable
                 if variable == null then return null
+               res.add_class("nc_v")
                 return variable.infobox(v)
         end
  end
@@ -671,9 +688,9 @@ redef class AForExpr
         redef fun decorate_tag(v, res, token)
         do
                 if not token isa TId then return null
-               res.add_class("nc_v")
                 var vs = variables
                 if vs == null then return null
+               res.add_class("nc_v")
                 var idx = n_ids.index_of(token)
                 var variable = vs[idx]
                 return variable.infobox(v)
@@ -683,11 +700,11 @@ end
  redef class AParam
         redef fun decorate_tag(v, res, token)
         do
-               res.add_class("nc_v")
                 var mp = mparameter
                 if mp == null then return null
                 var variable = self.variable
                 if variable == null then return null
+               res.add_class("nc_v")
                 return variable.infobox(v)
         end
  end
@@ -841,7 +858,7 @@ redef class AType
         do
                 var mt = mtype
                 if mt == null then return null
-               if mt isa MNullableType then mt = mt.mtype
+               mt = mt.as_notnullable
                 if mt isa MVirtualType or mt isa MParameterType then
                         res.add_class("nc_vt")
                 end