fixed up the std.util package a little

This commit is contained in:
James Strachan
2012-02-23 12:53:47 +00:00
parent 6c3ec61b5c
commit b5153de155
@@ -102,6 +102,9 @@ class KModel(var context: BindingContext, var title: String = "Documentation", v
if (created) { if (created) {
pkg.description = commentsFor(descriptor) pkg.description = commentsFor(descriptor)
addFunctions(pkg, pkg.functions, descriptor.getMemberScope()) addFunctions(pkg, pkg.functions, descriptor.getMemberScope())
if (pkg.functions.notEmpty()) {
pkg.local = true
}
} }
return pkg; return pkg;
} }
@@ -174,7 +177,13 @@ class KModel(var context: BindingContext, var title: String = "Documentation", v
} }
if (node == null) return "" if (node == null) return ""
if (node?.getElementType() != JetTokens.DOC_COMMENT) return "" if (node?.getElementType() != JetTokens.DOC_COMMENT) return ""
return node?.getText() ?: "" var text = node?.getText() ?: ""
// lets remove the comment tokens
//val lines = text.trim().split("\\n")
text = text.trim().trim("/").trim("*").trim()
// TODO convert any macros or wiki text!
return text
} }
return "" return ""
} }
@@ -241,7 +250,6 @@ class KPackage(val model: KModel, val descriptor: NamespaceDescriptor,
klass.baseClasses.add(sc) klass.baseClasses.add(sc)
} }
} }
//model.addFunctions(pkg, pkg.functions, descriptor.getMemberScope())
model.addFunctions(klass, klass.functions, classElement.getDefaultType().getMemberScope()) model.addFunctions(klass, klass.functions, classElement.getDefaultType().getMemberScope())
} }
return klass return klass