Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Align name of languageIds with vscode api

Browse Source
This commit is contained in:
Matt Bierner
2022-01-31 17:10:59 -08:00
parent 42914f99ab
commit babda1e42e
14 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/typescript-language-features/src/commands/learnMoreAboutRefactorings.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import * as vscode from 'vscode';
import { isTypeScriptDocument } from '../utils/languageModeIds';
import { isTypeScriptDocument } from '../utils/languageIds';
import { Command } from './commandManager';
export class LearnMoreAboutRefactoringsCommand implements Command {

2
extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
View File

@@ -9,7 +9,7 @@ import { ITypeScriptServiceClient } from '../typescriptService';
import API from '../utils/api';
import { Disposable } from '../utils/dispose';
import * as fileSchemes from '../utils/fileSchemes';
import { isTypeScriptDocument } from '../utils/languageModeIds';
import { isTypeScriptDocument } from '../utils/languageIds';
import { equals } from '../utils/objects';
import { ResourceMap } from '../utils/resourceMap';

2
extensions/typescript-language-features/src/languageFeatures/fileReferences.ts
View File

@@ -8,7 +8,7 @@ import * as nls from 'vscode-nls';
import { Command, CommandManager } from '../commands/commandManager';
import { ITypeScriptServiceClient } from '../typescriptService';
import API from '../utils/api';
import { isSupportedLanguageMode } from '../utils/languageModeIds';
import { isSupportedLanguageMode } from '../utils/languageIds';
import * as typeConverters from '../utils/typeConverters';
const localize = nls.loadMessageBundle();

2
extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts
View File

@@ -10,7 +10,7 @@
import * as vscode from 'vscode';
import { Disposable } from '../utils/dispose';
import * as languageModeIds from '../utils/languageModeIds';
import * as languageModeIds from '../utils/languageIds';
const jsTsLanguageConfiguration: vscode.LanguageConfiguration = {
indentationRules: {

6
extensions/typescript-language-features/src/languageProvider.ts
View File

@@ -43,7 +43,7 @@ export default class LanguageProvider extends Disposable {
private get documentSelector(): DocumentSelector {
const semantic: vscode.DocumentFilter[] = [];
const syntax: vscode.DocumentFilter[] = [];
for (const language of this.description.modeIds) {
for (const language of this.description.languageIds) {
syntax.push({ language });
for (const scheme of fileSchemes.semanticSupportedSchemes) {
semantic.push({ language, scheme });
@@ -84,7 +84,7 @@ export default class LanguageProvider extends Disposable {
import('./languageFeatures/smartSelect').then(provider => this._register(provider.register(selector, this.client))),
import('./languageFeatures/tagClosing').then(provider => this._register(provider.register(selector, this.description.id, this.client))),
import('./languageFeatures/typeDefinitions').then(provider => this._register(provider.register(selector, this.client))),
import('./languageFeatures/inlayHints').then(provider => this._register(provider.register(selector, this.description.id, this.description.modeIds, this.client, this.fileConfigurationManager))),
import('./languageFeatures/inlayHints').then(provider => this._register(provider.register(selector, this.description.id, this.description.languageIds, this.client, this.fileConfigurationManager))),
]);
}
@@ -100,7 +100,7 @@ export default class LanguageProvider extends Disposable {
}
public handlesDocument(doc: vscode.TextDocument): boolean {
return this.description.modeIds.includes(doc.languageId) || this.handlesConfigFile(doc.uri);
return this.description.languageIds.includes(doc.languageId) || this.handlesConfigFile(doc.uri);
}
private handlesConfigFile(resource: vscode.Uri) {

2
extensions/typescript-language-features/src/lazyClientHost.ts
View File

@@ -56,7 +56,7 @@ export function lazilyActivateClient(
const disposables: vscode.Disposable[] = [];
const supportedLanguage = flatten([
...standardLanguageDescriptions.map(x => x.modeIds),
...standardLanguageDescriptions.map(x => x.languageIds),
...pluginManager.plugins.map(x => x.languages)
]);

2
extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts
View File

@@ -11,7 +11,7 @@ import { coalesce } from '../utils/arrays';
import { Delayer, setImmediate } from '../utils/async';
import { nulToken } from '../utils/cancellation';
import { Disposable } from '../utils/dispose';
import * as languageModeIds from '../utils/languageModeIds';
import * as languageModeIds from '../utils/languageIds';
import { ResourceMap } from '../utils/resourceMap';
import * as typeConverters from '../utils/typeConverters';

6
extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
View File

@@ -121,7 +121,7 @@ export default class TypeScriptServiceClientHost extends Disposable {
if (plugin.configNamespace && plugin.languages.length) {
this.registerExtensionLanguageProvider({
id: plugin.configNamespace,
modeIds: Array.from(plugin.languages),
languageIds: Array.from(plugin.languages),
diagnosticSource: 'ts-plugin',
diagnosticLanguage: DiagnosticLanguage.TypeScript,
diagnosticOwner: 'typescript',
@@ -138,7 +138,7 @@ export default class TypeScriptServiceClientHost extends Disposable {
if (languages.size) {
this.registerExtensionLanguageProvider({
id: 'typescript-plugins',
modeIds: Array.from(languages.values()),
languageIds: Array.from(languages.values()),
diagnosticSource: 'ts-plugin',
diagnosticLanguage: DiagnosticLanguage.TypeScript,
diagnosticOwner: 'typescript',
@@ -166,7 +166,7 @@ export default class TypeScriptServiceClientHost extends Disposable {
private getAllModeIds(descriptions: LanguageDescription[], pluginManager: PluginManager) {
const allModeIds = flatten([
...descriptions.map(x => x.modeIds),
...descriptions.map(x => x.languageIds),
...pluginManager.plugins.map(x => x.languages)
]);
return allModeIds;

2
extensions/typescript-language-features/src/ui/intellisenseStatus.ts
View File

@@ -9,7 +9,7 @@ import { CommandManager } from '../commands/commandManager';
import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
import { ActiveJsTsEditorTracker } from '../utils/activeJsTsEditorTracker';
import { Disposable } from '../utils/dispose';
import { isSupportedLanguageMode, isTypeScriptDocument, jsTsLanguageModes } from '../utils/languageModeIds';
import { isSupportedLanguageMode, isTypeScriptDocument, jsTsLanguageModes } from '../utils/languageIds';
import { isImplicitProjectConfigFile, openOrCreateConfig, openProjectConfigForFile, openProjectConfigOrPromptToCreate, ProjectType } from '../utils/tsconfig';
const localize = nls.loadMessageBundle();

2
extensions/typescript-language-features/src/ui/versionStatus.ts
View File

@@ -9,7 +9,7 @@ import { SelectTypeScriptVersionCommand } from '../commands/selectTypeScriptVers
import { TypeScriptVersion } from '../tsServer/versionProvider';
import { ITypeScriptServiceClient } from '../typescriptService';
import { Disposable } from '../utils/dispose';
import { jsTsLanguageModes } from '../utils/languageModeIds';
import { jsTsLanguageModes } from '../utils/languageIds';
const localize = nls.loadMessageBundle();

2
extensions/typescript-language-features/src/utils/activeJsTsEditorTracker.ts
View File

@@ -6,7 +6,7 @@
import * as vscode from 'vscode';
import { Disposable } from './dispose';
import { isJsConfigOrTsConfigFileName } from './languageDescription';
import { isSupportedLanguageMode } from './languageModeIds';
import { isSupportedLanguageMode } from './languageIds';
/**
* Tracks the active JS/TS editor.

8
extensions/typescript-language-features/src/utils/languageDescription.ts
View File

@@ -5,7 +5,7 @@
import { basename } from 'path';
import * as vscode from 'vscode';
import * as languageModeIds from './languageModeIds';
import * as languageIds from './languageIds';
export const enum DiagnosticLanguage {
JavaScript,
@@ -19,7 +19,7 @@ export interface LanguageDescription {
readonly diagnosticOwner: string;
readonly diagnosticSource: string;
readonly diagnosticLanguage: DiagnosticLanguage;
readonly modeIds: readonly string[];
readonly languageIds: readonly string[];
readonly configFilePattern?: RegExp;
readonly isExternal?: boolean;
readonly standardFileExtensions: readonly string[],
@@ -31,7 +31,7 @@ export const standardLanguageDescriptions: LanguageDescription[] = [
diagnosticOwner: 'typescript',
diagnosticSource: 'ts',
diagnosticLanguage: DiagnosticLanguage.TypeScript,
modeIds: [languageModeIds.typescript, languageModeIds.typescriptreact],
languageIds: [languageIds.typescript, languageIds.typescriptreact],
configFilePattern: /^tsconfig(\..*)?\.json$/gi,
standardFileExtensions: [
'ts',
@@ -44,7 +44,7 @@ export const standardLanguageDescriptions: LanguageDescription[] = [
diagnosticOwner: 'typescript',
diagnosticSource: 'ts',
diagnosticLanguage: DiagnosticLanguage.JavaScript,
modeIds: [languageModeIds.javascript, languageModeIds.javascriptreact],
languageIds: [languageIds.javascript, languageIds.javascriptreact],
configFilePattern: /^jsconfig(\..*)?\.json$/gi,
standardFileExtensions: [
'js',

0
extensions/typescript-language-features/src/utils/languageModeIds.ts → extensions/typescript-language-features/src/utils/languageIds.ts
View File

2
extensions/typescript-language-features/src/utils/managedFileContext.ts
View File

@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
import { ActiveJsTsEditorTracker } from './activeJsTsEditorTracker';
import { Disposable } from './dispose';
import { isJsConfigOrTsConfigFileName } from './languageDescription';
import { isSupportedLanguageMode } from './languageModeIds';
import { isSupportedLanguageMode } from './languageIds';
/**E
* When clause context set when the current file is managed by vscode's built-in typescript extension.