@theia/markers 1.26.0-next.7 → 1.26.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/marker-tree-label-provider.spec.js +13 -2
- package/lib/browser/marker-tree-label-provider.spec.js.map +1 -1
- package/lib/browser/problem/problem-decorator.js +2 -2
- package/lib/browser/problem/problem-decorator.js.map +1 -1
- package/package.json +6 -6
- package/src/browser/marker-tree-label-provider.spec.ts +12 -2
- package/src/browser/problem/problem-decorator.ts +2 -2
|
@@ -35,6 +35,7 @@ const files_1 = require("@theia/filesystem/lib/common/files");
|
|
|
35
35
|
const env_variables_1 = require("@theia/core/lib/common/env-variables");
|
|
36
36
|
const mock_env_variables_server_1 = require("@theia/core/lib/browser/test/mock-env-variables-server");
|
|
37
37
|
const node_1 = require("@theia/core/lib/node");
|
|
38
|
+
const os_1 = require("@theia/core/lib/common/os");
|
|
38
39
|
const temp = require("temp");
|
|
39
40
|
disableJSDOM();
|
|
40
41
|
let markerTreeLabelProvider;
|
|
@@ -105,7 +106,12 @@ describe('Marker Tree Label Provider', () => {
|
|
|
105
106
|
});
|
|
106
107
|
it('should return the full path when the resource does not exist in the workspace root', () => {
|
|
107
108
|
const label = markerTreeLabelProvider.getLongName(createMarkerInfoNode('file:///home/b/foo.ts'));
|
|
108
|
-
|
|
109
|
+
if (os_1.OS.backend.isWindows) {
|
|
110
|
+
(0, chai_1.expect)(label).eq('\\home\\b');
|
|
111
|
+
}
|
|
112
|
+
else {
|
|
113
|
+
(0, chai_1.expect)(label).eq('/home/b');
|
|
114
|
+
}
|
|
109
115
|
});
|
|
110
116
|
});
|
|
111
117
|
describe('multi-root workspace', () => {
|
|
@@ -131,7 +137,12 @@ describe('Marker Tree Label Provider', () => {
|
|
|
131
137
|
});
|
|
132
138
|
it('should return the full path when the resource does not exist in any workspace root', () => {
|
|
133
139
|
const label = markerTreeLabelProvider.getLongName(createMarkerInfoNode('file:///home/a/b/foo.ts'));
|
|
134
|
-
|
|
140
|
+
if (os_1.OS.backend.isWindows) {
|
|
141
|
+
(0, chai_1.expect)(label).eq('\\home\\a\\b');
|
|
142
|
+
}
|
|
143
|
+
else {
|
|
144
|
+
(0, chai_1.expect)(label).eq('/home/a/b');
|
|
145
|
+
}
|
|
135
146
|
});
|
|
136
147
|
});
|
|
137
148
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marker-tree-label-provider.spec.js","sourceRoot":"","sources":["../../src/browser/marker-tree-label-provider.spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"marker-tree-label-provider.spec.js","sourceRoot":"","sources":["../../src/browser/marker-tree-label-provider.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,11 +105,11 @@ let ProblemDecorator = ProblemDecorator_1 = class ProblemDecorator {
|
|
|
105
105
|
if (parentWorkspace) {
|
|
106
106
|
const relativeDirFromWorkspace = parentWorkspace.relative(nodeURIDir);
|
|
107
107
|
workspacePrefixString = workspaceRoots.length > 1 ? this.labelProvider.getName(parentWorkspace) : '';
|
|
108
|
-
filePathString = (_a = relativeDirFromWorkspace === null || relativeDirFromWorkspace === void 0 ? void 0 : relativeDirFromWorkspace.
|
|
108
|
+
filePathString = (_a = relativeDirFromWorkspace === null || relativeDirFromWorkspace === void 0 ? void 0 : relativeDirFromWorkspace.fsPath()) !== null && _a !== void 0 ? _a : '';
|
|
109
109
|
separator = filePathString && workspacePrefixString ? ' \u2022 ' : ''; // add a bullet point between workspace and path
|
|
110
110
|
}
|
|
111
111
|
else {
|
|
112
|
-
workspacePrefixString = nodeURIDir.path.
|
|
112
|
+
workspacePrefixString = nodeURIDir.path.fsPath();
|
|
113
113
|
}
|
|
114
114
|
return `${workspacePrefixString}${separator}${filePathString}`;
|
|
115
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"problem-decorator.js","sourceRoot":"","sources":["../../../src/browser/problem/problem-decorator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"problem-decorator.js","sourceRoot":"","sources":["../../../src/browser/problem/problem-decorator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/markers",
|
|
3
|
-
"version": "1.26.0
|
|
3
|
+
"version": "1.26.0",
|
|
4
4
|
"description": "Theia - Markers Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.26.0
|
|
7
|
-
"@theia/filesystem": "1.26.0
|
|
8
|
-
"@theia/workspace": "1.26.0
|
|
6
|
+
"@theia/core": "1.26.0",
|
|
7
|
+
"@theia/filesystem": "1.26.0",
|
|
8
|
+
"@theia/workspace": "1.26.0"
|
|
9
9
|
},
|
|
10
10
|
"publishConfig": {
|
|
11
11
|
"access": "public"
|
|
@@ -40,10 +40,10 @@
|
|
|
40
40
|
"watch": "theiaext watch"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@theia/ext-scripts": "1.
|
|
43
|
+
"@theia/ext-scripts": "1.26.0"
|
|
44
44
|
},
|
|
45
45
|
"nyc": {
|
|
46
46
|
"extends": "../../configs/nyc.json"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "38e2466568e69d55a9c64c96878deff5a005b814"
|
|
49
49
|
}
|
|
@@ -40,6 +40,7 @@ import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
|
40
40
|
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
|
|
41
41
|
import { MockEnvVariablesServerImpl } from '@theia/core/lib/browser/test/mock-env-variables-server';
|
|
42
42
|
import { FileUri } from '@theia/core/lib/node';
|
|
43
|
+
import { OS } from '@theia/core/lib/common/os';
|
|
43
44
|
import * as temp from 'temp';
|
|
44
45
|
|
|
45
46
|
disableJSDOM();
|
|
@@ -131,7 +132,11 @@ describe('Marker Tree Label Provider', () => {
|
|
|
131
132
|
const label = markerTreeLabelProvider.getLongName(
|
|
132
133
|
createMarkerInfoNode('file:///home/b/foo.ts')
|
|
133
134
|
);
|
|
134
|
-
|
|
135
|
+
if (OS.backend.isWindows) {
|
|
136
|
+
expect(label).eq('\\home\\b');
|
|
137
|
+
} else {
|
|
138
|
+
expect(label).eq('/home/b');
|
|
139
|
+
}
|
|
135
140
|
});
|
|
136
141
|
});
|
|
137
142
|
describe('multi-root workspace', () => {
|
|
@@ -165,7 +170,12 @@ describe('Marker Tree Label Provider', () => {
|
|
|
165
170
|
const label = markerTreeLabelProvider.getLongName(
|
|
166
171
|
createMarkerInfoNode('file:///home/a/b/foo.ts')
|
|
167
172
|
);
|
|
168
|
-
|
|
173
|
+
|
|
174
|
+
if (OS.backend.isWindows) {
|
|
175
|
+
expect(label).eq('\\home\\a\\b');
|
|
176
|
+
} else {
|
|
177
|
+
expect(label).eq('/home/a/b');
|
|
178
|
+
}
|
|
169
179
|
});
|
|
170
180
|
});
|
|
171
181
|
});
|
|
@@ -109,10 +109,10 @@ export class ProblemDecorator implements TreeDecorator {
|
|
|
109
109
|
if (parentWorkspace) {
|
|
110
110
|
const relativeDirFromWorkspace = parentWorkspace.relative(nodeURIDir);
|
|
111
111
|
workspacePrefixString = workspaceRoots.length > 1 ? this.labelProvider.getName(parentWorkspace) : '';
|
|
112
|
-
filePathString = relativeDirFromWorkspace?.
|
|
112
|
+
filePathString = relativeDirFromWorkspace?.fsPath() ?? '';
|
|
113
113
|
separator = filePathString && workspacePrefixString ? ' \u2022 ' : ''; // add a bullet point between workspace and path
|
|
114
114
|
} else {
|
|
115
|
-
workspacePrefixString = nodeURIDir.path.
|
|
115
|
+
workspacePrefixString = nodeURIDir.path.fsPath();
|
|
116
116
|
}
|
|
117
117
|
return `${workspacePrefixString}${separator}${filePathString}`;
|
|
118
118
|
}
|