Skip to content

Commit

Permalink
Merge branch 'server-side' of https://github.com/isc-bsaviano/vscode-…
Browse files Browse the repository at this point in the history
…objectscript into server-side
  • Loading branch information
isc-bsaviano committed Feb 20, 2025
2 parents 2e8d972 + 30d4a41 commit cf300ec
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ export class AtelierAPI {
namespace = parts[1];
} else {
const { ns } = isfsConfig(wsOrFile);
if (ns) namespace = ns;
if (ns) {
namespace = ns;
}
}
} else {
const wsFolderOfFile = vscode.workspace.getWorkspaceFolder(wsOrFile);
Expand Down
2 changes: 1 addition & 1 deletion src/providers/DocumentContentProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ export class DocumentContentProvider implements vscode.TextDocumentContentProvid

public async provideTextDocumentContent(uri: vscode.Uri, token: vscode.CancellationToken): Promise<string> {
const api = new AtelierAPI(uri);
// Even though this is technically a "objectscript" Uri, the query parameters are the same as "isfs"
// Even though this is technically an "objectscript" Uri, the query parameters are the same as "isfs"
const { csp, ns } = isfsConfig(uri);
const fileName = csp ? uri.path.slice(1) : uri.path.split("/").slice(1).join(".");
if (ns) api.setNamespace(ns);
Expand Down

0 comments on commit cf300ec

Please sign in to comment.