@opensumi/ide-core-browser 3.8.3-next-1743584892.0 → 3.8.3-next-1743647111.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"label-service.d.ts","sourceRoot":"","sources":["../../src/services/label-service.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,EACV,UAAU,EAEV,KAAK,EACL,WAAW,
|
|
1
|
+
{"version":3,"file":"label-service.d.ts","sourceRoot":"","sources":["../../src/services/label-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -250,14 +250,14 @@ const getIconClass = (resource, options) => {
|
|
|
250
250
|
if (!modelService) {
|
|
251
251
|
modelService = standaloneServices_1.StandaloneServices.get(model_1.IModelService);
|
|
252
252
|
}
|
|
253
|
-
const detectedModeId = detectModeId(modelService, languageService, resource.
|
|
253
|
+
const detectedModeId = detectModeId(modelService, languageService, uri_1.URI.file(resource.withoutQuery().toString()));
|
|
254
254
|
if (detectedModeId) {
|
|
255
255
|
classes.push(`${cssEscape(detectedModeId)}-lang-file-icon`);
|
|
256
256
|
}
|
|
257
257
|
else {
|
|
258
258
|
_onDidChange = new ide_core_common_1.Emitter();
|
|
259
259
|
ide_core_common_1.Event.any(languageService.onDidRequestBasicLanguageFeatures, languageService.onDidRequestRichLanguageFeatures)(() => {
|
|
260
|
-
if (detectModeId(modelService, languageService, resource.
|
|
260
|
+
if (detectModeId(modelService, languageService, uri_1.URI.file(resource.withoutQuery().toString()))) {
|
|
261
261
|
_onDidChange === null || _onDidChange === void 0 ? void 0 : _onDidChange.fire();
|
|
262
262
|
_onDidChange === null || _onDidChange === void 0 ? void 0 : _onDidChange.dispose();
|
|
263
263
|
}
|
|
@@ -278,18 +278,6 @@ function cssEscape(str) {
|
|
|
278
278
|
function basenameOrAuthority(resource) {
|
|
279
279
|
return resource.path.base || resource.authority;
|
|
280
280
|
}
|
|
281
|
-
function getLanguageIdByExtension(resource) {
|
|
282
|
-
const ext = resource.path.toLowerCase().split('.').pop();
|
|
283
|
-
if (!ext) {
|
|
284
|
-
return null;
|
|
285
|
-
}
|
|
286
|
-
for (const [langId, suffix] of Object.entries(ide_core_common_1.LANGUAGE_TO_SUFFIX)) {
|
|
287
|
-
if (suffix.toLowerCase() === `.${ext}`) {
|
|
288
|
-
return langId;
|
|
289
|
-
}
|
|
290
|
-
}
|
|
291
|
-
return null;
|
|
292
|
-
}
|
|
293
281
|
function detectModeId(modelService, languageService, resource) {
|
|
294
282
|
if (!resource) {
|
|
295
283
|
return null; // we need a resource at least
|
|
@@ -314,21 +302,15 @@ function detectModeId(modelService, languageService, resource) {
|
|
|
314
302
|
return modeId;
|
|
315
303
|
}
|
|
316
304
|
// otherwise fallback to path based detection
|
|
305
|
+
// return modeService.getModeIdByFilepathOrFirstLine(resource);
|
|
317
306
|
const guessLanguageId = languageService.guessLanguageIdByFilepathOrFirstLine(resource);
|
|
318
|
-
//
|
|
319
|
-
if (guessLanguageId === 'unknown') {
|
|
320
|
-
const langId = getLanguageIdByExtension(resource);
|
|
321
|
-
if (langId) {
|
|
322
|
-
return langId;
|
|
323
|
-
}
|
|
324
|
-
}
|
|
325
|
-
// guess langeuage id by extname
|
|
307
|
+
// 相关 issue: https://github.com/microsoft/vscode/commit/2959fcde6aa9ff2058ad13cef8a5265ddb5f58a4#diff-7dd3b615572806b4d2210a9e7b32e1ae3714bc7b5fb201e437edaa8b372ce1aaR188
|
|
326
308
|
return guessLanguageId === 'unknown' ? null : guessLanguageId;
|
|
327
309
|
}
|
|
328
310
|
function getLanguageIdFromMonaco(uri) {
|
|
329
311
|
languageService = standaloneServices_1.StandaloneServices.get(language_1.ILanguageService);
|
|
330
312
|
modelService = standaloneServices_1.StandaloneServices.get(model_1.IModelService);
|
|
331
|
-
return detectModeId(modelService, languageService, uri.
|
|
313
|
+
return detectModeId(modelService, languageService, uri_1.URI.parse(uri.toString()));
|
|
332
314
|
}
|
|
333
315
|
/**
|
|
334
316
|
* labelService所处理的label或者icon变更的事件
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"label-service.js","sourceRoot":"","sources":["../../src/services/label-service.ts"],"names":[],"mappings":";;;AAyFA,sDAUC;AAED,0DAUC;AA0ND,8BAEC;AAED,kDAEC;
|
|
1
|
+
{"version":3,"file":"label-service.js","sourceRoot":"","sources":["../../src/services/label-service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-core-browser",
|
|
3
|
-
"version": "3.8.3-next-
|
|
3
|
+
"version": "3.8.3-next-1743647111.0",
|
|
4
4
|
"description": "@opensumi/ide-core-browser",
|
|
5
5
|
"files": [
|
|
6
6
|
"lib",
|
|
@@ -18,9 +18,9 @@
|
|
|
18
18
|
"build": "tsc --build ../../configs/ts/references/tsconfig.core-browser.json"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@opensumi/ide-components": "3.8.3-next-
|
|
22
|
-
"@opensumi/ide-connection": "3.8.3-next-
|
|
23
|
-
"@opensumi/ide-core-common": "3.8.3-next-
|
|
21
|
+
"@opensumi/ide-components": "3.8.3-next-1743647111.0",
|
|
22
|
+
"@opensumi/ide-connection": "3.8.3-next-1743647111.0",
|
|
23
|
+
"@opensumi/ide-core-common": "3.8.3-next-1743647111.0",
|
|
24
24
|
"@opensumi/vscode-debugprotocol": "1.49.0-beta.1",
|
|
25
25
|
"@vscode/codicons": "0.0.35",
|
|
26
26
|
"ajv": "^6.10.0",
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"react": "^18.2.0",
|
|
42
42
|
"react-dom": "^18.2.0"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "6e70216af8c32af8d8bc67ccdf7a7d1163ce96cf"
|
|
45
45
|
}
|
|
@@ -7,7 +7,6 @@ import {
|
|
|
7
7
|
Emitter,
|
|
8
8
|
Event,
|
|
9
9
|
IDisposable,
|
|
10
|
-
LANGUAGE_TO_SUFFIX,
|
|
11
10
|
LRUMap,
|
|
12
11
|
URI,
|
|
13
12
|
WithEventBus,
|
|
@@ -19,6 +18,7 @@ import { IModelService } from '@opensumi/monaco-editor-core/esm/vs/editor/common
|
|
|
19
18
|
import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
|
|
20
19
|
|
|
21
20
|
import { getIcon } from '../style/icon/icon';
|
|
21
|
+
|
|
22
22
|
const { addElement } = arrays;
|
|
23
23
|
|
|
24
24
|
/**
|
|
@@ -302,7 +302,7 @@ const getIconClass = (
|
|
|
302
302
|
if (!modelService) {
|
|
303
303
|
modelService = StandaloneServices.get(IModelService);
|
|
304
304
|
}
|
|
305
|
-
const detectedModeId = detectModeId(modelService, languageService, resource.
|
|
305
|
+
const detectedModeId = detectModeId(modelService, languageService, Uri.file(resource.withoutQuery().toString()));
|
|
306
306
|
if (detectedModeId) {
|
|
307
307
|
classes.push(`${cssEscape(detectedModeId)}-lang-file-icon`);
|
|
308
308
|
} else {
|
|
@@ -311,7 +311,7 @@ const getIconClass = (
|
|
|
311
311
|
languageService.onDidRequestBasicLanguageFeatures,
|
|
312
312
|
languageService.onDidRequestRichLanguageFeatures,
|
|
313
313
|
)(() => {
|
|
314
|
-
if (detectModeId(modelService, languageService, resource.
|
|
314
|
+
if (detectModeId(modelService, languageService, Uri.file(resource.withoutQuery().toString()))) {
|
|
315
315
|
_onDidChange?.fire();
|
|
316
316
|
_onDidChange?.dispose();
|
|
317
317
|
}
|
|
@@ -335,20 +335,6 @@ export function basenameOrAuthority(resource: URI) {
|
|
|
335
335
|
return resource.path.base || resource.authority;
|
|
336
336
|
}
|
|
337
337
|
|
|
338
|
-
function getLanguageIdByExtension(resource: Uri): string | null {
|
|
339
|
-
const ext = resource.path.toLowerCase().split('.').pop();
|
|
340
|
-
if (!ext) {
|
|
341
|
-
return null;
|
|
342
|
-
}
|
|
343
|
-
|
|
344
|
-
for (const [langId, suffix] of Object.entries(LANGUAGE_TO_SUFFIX)) {
|
|
345
|
-
if (suffix.toLowerCase() === `.${ext}`) {
|
|
346
|
-
return langId;
|
|
347
|
-
}
|
|
348
|
-
}
|
|
349
|
-
return null;
|
|
350
|
-
}
|
|
351
|
-
|
|
352
338
|
export function detectModeId(
|
|
353
339
|
modelService: IModelService,
|
|
354
340
|
languageService: ILanguageService,
|
|
@@ -359,10 +345,12 @@ export function detectModeId(
|
|
|
359
345
|
}
|
|
360
346
|
|
|
361
347
|
let modeId: string | null = null;
|
|
348
|
+
|
|
362
349
|
// Data URI: check for encoded metadata
|
|
363
350
|
if (resource.scheme === 'data') {
|
|
364
351
|
const metadata = DataUri.parseMetaData(resource);
|
|
365
352
|
const mime = metadata.get(DataUri.META_DATA_MIME);
|
|
353
|
+
|
|
366
354
|
if (mime) {
|
|
367
355
|
modeId = languageService.getLanguageIdByMimeType(mime);
|
|
368
356
|
}
|
|
@@ -379,24 +367,16 @@ export function detectModeId(
|
|
|
379
367
|
}
|
|
380
368
|
|
|
381
369
|
// otherwise fallback to path based detection
|
|
370
|
+
// return modeService.getModeIdByFilepathOrFirstLine(resource);
|
|
382
371
|
const guessLanguageId = languageService.guessLanguageIdByFilepathOrFirstLine(resource);
|
|
383
|
-
|
|
384
|
-
// 如果 guessLanguageId 为 'unknown'，尝试通过文件后缀名判断
|
|
385
|
-
if (guessLanguageId === 'unknown') {
|
|
386
|
-
const langId = getLanguageIdByExtension(resource);
|
|
387
|
-
if (langId) {
|
|
388
|
-
return langId;
|
|
389
|
-
}
|
|
390
|
-
}
|
|
391
|
-
|
|
392
|
-
// guess langeuage id by extname
|
|
372
|
+
// 相关 issue: https://github.com/microsoft/vscode/commit/2959fcde6aa9ff2058ad13cef8a5265ddb5f58a4#diff-7dd3b615572806b4d2210a9e7b32e1ae3714bc7b5fb201e437edaa8b372ce1aaR188
|
|
393
373
|
return guessLanguageId === 'unknown' ? null : guessLanguageId;
|
|
394
374
|
}
|
|
395
375
|
|
|
396
376
|
export function getLanguageIdFromMonaco(uri: URI) {
|
|
397
377
|
languageService = StandaloneServices.get(ILanguageService);
|
|
398
378
|
modelService = StandaloneServices.get(IModelService);
|
|
399
|
-
return detectModeId(modelService, languageService, uri.
|
|
379
|
+
return detectModeId(modelService, languageService, Uri.parse(uri.toString()));
|
|
400
380
|
}
|
|
401
381
|
|
|
402
382
|
/**
|