@@ -29,26 +29,28 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
29
29
const parent = await this . _lookupAsDirectory ( uri ) ;
30
30
const sql = `CALL %Library.RoutineMgr_StudioOpenDialog(?,?,?,?,?,?,?)` ;
31
31
const { query } = url . parse ( decodeURIComponent ( uri . toString ( ) ) , true ) ;
32
- const type = String ( query && query . type ) . toLowerCase ( ) || "all" ;
32
+ const type = query . type && query . type != "" ? query . type . toString ( ) : "all" ;
33
33
const csp = query . csp === "" || query . csp === "1" ;
34
- let filter : string = query . filter ? query . file . toString ( ) : "" ;
35
- if ( csp ) {
36
- filter = filter || "*" ;
34
+ let filter = "" ;
35
+ if ( query . filter && query . filter . length ) {
36
+ filter = query . filter . toString ( ) ;
37
+ } else if ( csp ) {
38
+ filter = "*" ;
37
39
} else if ( type === "rtn" ) {
38
- filter = "*.inc,*.int ,*.mac " ;
40
+ filter = "*.inc,*.mac ,*.int " ;
39
41
} else if ( type === "cls" ) {
40
42
filter = "*.cls" ;
41
43
} else {
42
- filter = query . filter ? query . file . toString ( ) : "*.cls,*.inc,*.int ,*.mac " ;
44
+ filter = "*.cls,*.inc,*.mac ,*.int " ;
43
45
}
44
46
const folder = csp ? ( uri . path . endsWith ( "/" ) ? uri . path : uri . path + "/" ) : uri . path . replace ( / \/ / g, "." ) ;
45
47
const spec = csp ? folder + filter : folder . length > 1 ? folder . slice ( 1 ) + "/" + filter : filter ;
46
48
const dir = "1" ;
47
49
const orderBy = "1" ;
48
50
const system = api . ns === "%SYS" ? "1" : "0" ;
49
- const flat = String ( query . flat ) || "0" ;
51
+ const flat = query . flat && query . flat . length ? query . flat . toString ( ) : "0" ;
50
52
const notStudio = "0" ;
51
- const generated = String ( query . generated ) || "0" ;
53
+ const generated = query . generated && query . generated . length ? query . generated . toString ( ) : "0" ;
52
54
return api
53
55
. actionQuery ( sql , [ spec , dir , orderBy , system , flat , notStudio , generated ] )
54
56
. then ( data => data . result . content || [ ] )
0 commit comments