azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Got rid of "namespace" word in test data.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-01-10 23:42:19 +04:00
parent ee3312fb00
commit 958f7c862d
102 changed files with 302 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
+2 -2
View File
@@ -247,7 +247,7 @@ class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs
if (packageFragment != null) {
allPackageFragments.add(packageFragment);
} else {
warning("No NamespaceDescriptor for source $source")
warning("No PackageFragmentDescriptor for source $source")
}
}
val allClasses = HashSet<KClass>()
@@ -847,7 +847,7 @@ class TemplateLinkRenderer(val annotated: KAnnotated, val template: KDocTemplate
protected fun findWritableScope(declarationDescriptor: DeclarationDescriptor) : WritableScopeImpl? {
val container = declarationDescriptor.getContainingDeclaration()
if (container is NamespaceDescriptor) {
if (container is PackageFragmentDescriptor) {
val scope = container.getMemberScope()
if (scope is WritableScopeImpl) {
return scope
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
Vendored
+2 -2
View File
@@ -91,7 +91,7 @@ abstract class KDocTemplate() : TextTemplate() {
} else if (owner is KPackage) {
if (!owner.useExternalLink) {
// TODO how to find the function in a package???
"${rootHref(owner)}${names.htmlSourceDirName}/namespace.html#${names.lineNumberLinkHref(f.sourceLine)}"
"${rootHref(owner)}${names.htmlSourceDirName}/package.html#${names.lineNumberLinkHref(f.sourceLine)}"
} else {
href(owner)
}
@@ -114,7 +114,7 @@ abstract class KDocTemplate() : TextTemplate() {
} else if (owner is KPackage) {
if (!owner.useExternalLink) {
// TODO how to find the function in a package???
"${rootHref(owner)}${names.htmlSourceDirName}/namespace.html#${names.lineNumberLinkHref(f.sourceLine)}"
"${rootHref(owner)}${names.htmlSourceDirName}/package.html#${names.lineNumberLinkHref(f.sourceLine)}"
} else {
href(owner)
}
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt
+1 -1
View File
@@ -11,7 +11,7 @@ import java.io.Writer
* Represents a generic API to templates which should be usable
* in JavaScript in a browser or on the server side stand alone or in a web app etc.
*
* To make things easier to implement in JS this namespace won't refer to any java.io or servlet
* To make things easier to implement in JS this package won't refer to any java.io or servlet
* stuff
*/
trait Template {