Skip to content

Commit 105f2f2

Browse files
committed
fix
1 parent 8714490 commit 105f2f2

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

Diff for: cache/projectTemplate.xml

+5-8
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ Returns structured class tree with all classes available in current namespace</D
8383
<Description>
8484
Return structured data about class.</Description>
8585
<ClassMethod>1</ClassMethod>
86-
<FormalSpec>oData:%ZEN.proxyObject,className:%String,level:%Integer,currLevel:%Integer</FormalSpec>
86+
<FormalSpec>oData:%ZEN.proxyObject,className:%String,level:%String="",currLevel:%Integer=0</FormalSpec>
8787
<Private>1</Private>
8888
<ReturnType>%ZEN.proxyObject</ReturnType>
8989
<Implementation><![CDATA[
90-
if (($GET(level)'="")&&(+$GET(currLevel)>+$GET(level))) quit ""
90+
if ((level'="")&&(+currLevel>+level)) quit ""
9191
set currLevel=$increment(currLevel)
9292
set classDefinition = ##class(%Dictionary.ClassDefinition).%OpenId(className)
9393
set compiledClassDefinition = ##class(%Dictionary.CompiledClass).%OpenId(className)
@@ -122,13 +122,12 @@ Return structured data about class.</Description>
122122
123123
set oClass.Super = "" // do not quit with super at this moment
124124
if (oData.restrictPackage) && ('..inPackage(oData.basePackageName, package)) quit oClass
125-
if (+$GET(level)=0) set oClass.Super = ..correctInheritance(oData, classDefinition, package) // now expand super names
125+
set oClass.Super = ..correctInheritance(oData, classDefinition, package) // now expand super names
126126
127127
set oClass.properties = oProperties
128128
set count = classDefinition.Properties.Count()
129129
set props = ##class(%Dictionary.ClassDefinition).%OpenId("%Dictionary.PropertyDefinition")
130130
for i=1:1:count {
131-
set ignore=""
132131
set oProp = ##class(%ZEN.proxyObject).%New()
133132
set p = classDefinition.Properties.GetAt(i)
134133
do oProperties.%DispatchSetProperty(p.Name, oProp)
@@ -138,15 +137,13 @@ Return structured data about class.</Description>
138137
}
139138
if (..classExists(package _ "." _ p.Type)) {
140139
set oProp.Type = package _ "." _ p.Type
141-
do ..fillClassData(oData, package _ "." _ p.Type, $GET(level), currLevel)
142-
set ignore=1
140+
do ..fillClassData(oData, package _ "." _ p.Type, level, currLevel)
143141
} elseif (..classExists(..extendClassFromType(p.Type))) {
144142
set oProp.Type = ..extendClassFromType(p.Type)
145-
do ..fillClassData(oData, ..extendClassFromType(p.Type), $GET(level), currLevel)
143+
do ..fillClassData(oData, ..extendClassFromType(p.Type), level, currLevel)
146144
} else {
147145
set oProp.Type = ..extendClassFromType(p.Type)
148146
}
149-
if (($GET(ignore)="")&&($GET(level)'="")&&(+$GET(currLevel)>1)) set oProp.Type = oProp.Type_$Char(32)
150147
}
151148
152149
set oMethods = ##class(%ZEN.proxyObject).%New()

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "CacheClassExplorer",
3-
"version": "1.13.3",
3+
"version": "1.13.4",
44
"description": "Class Explorer for InterSystems Caché",
55
"directories": {
66
"test": "test"

0 commit comments

Comments
 (0)