Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-561 Fix file path handling for Windows #116

Merged
merged 1 commit into from
May 26, 2022
Merged

GH-561 Fix file path handling for Windows #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions examples/browser-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
"version": "0.9.0",
"dependencies": {
"@eclipse-glsp-examples/workflow-theia": "0.9.0",
"@theia/core": "^1.24.0",
"@theia/editor": "^1.24.0",
"@theia/filesystem": "^1.24.0",
"@theia/markers": "^1.24.0",
"@theia/messages": "^1.24.0",
"@theia/monaco": "^1.24.0",
"@theia/navigator": "^1.24.0",
"@theia/preferences": "^1.24.0",
"@theia/process": "^1.24.0",
"@theia/terminal": "^1.24.0",
"@theia/workspace": "^1.24.0"
"@theia/core": "^1.25.0",
"@theia/editor": "^1.25.0",
"@theia/filesystem": "^1.25.0",
"@theia/markers": "^1.25.0",
"@theia/messages": "^1.25.0",
"@theia/monaco": "^1.25.0",
"@theia/navigator": "^1.25.0",
"@theia/preferences": "^1.25.0",
"@theia/process": "^1.25.0",
"@theia/terminal": "^1.25.0",
"@theia/workspace": "^1.25.0"
},
"devDependencies": {
"@theia/cli": "^1.24.0"
"@theia/cli": "^1.25.0"
},
"scripts": {
"prepare": "yarn build",
Expand Down
2 changes: 1 addition & 1 deletion packages/theia-integration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
],
"dependencies": {
"@eclipse-glsp/client": "next",
"@theia/messages": "^1.24.0",
"@theia/messages": "^1.25.0",
"sprotty-theia": "next"
},
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions packages/theia-integration/src/browser/diagram/glsp-diagram-widget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export class GLSPDiagramWidget extends DiagramWidget implements SaveableSource {
super(options, widgetId, diContainer, connector);
this.saveable = new SaveableGLSPModelSource(this.actionDispatcher, this.diContainer.get<ModelSource>(TYPES.ModelSource));
this.updateSaveable();
this.title.caption = this.uri.path.toString();
this.title.caption = this.uri.path.fsPath();
const prefUpdater = editorPreferences.onPreferenceChanged(() => this.updateSaveable());
this.toDispose.push(prefUpdater);
this.toDispose.push(this.saveable);
Expand Down Expand Up @@ -94,7 +94,7 @@ export class GLSPDiagramWidget extends DiagramWidget implements SaveableSource {
// Filter options to only contain defined primitive values
const definedOptions: any = pickBy(this.options, v => v !== undefined && typeof v !== 'object');
this.requestModelOptions = {
sourceUri: this.uri.path.toString(),
sourceUri: this.uri.path.fsPath(),
...definedOptions
};

Expand Down Expand Up @@ -385,7 +385,7 @@ export class SaveableGLSPModelSource implements Saveable, Disposable {
}

// Needs to be implemented to pass the type check of `WorkspaceFrontendContribution.canBeSaved`.
createSnapshot(): object {
createSnapshot(): Saveable.Snapshot {
throw new Error('GLSP only supports server-side saving. `createSnapshot` should never be invoked');
}

Expand Down
Loading