semantic highligting: deprecate member, add method. Fixes microsoft/l…

…anguage-server-protocol#1087

extensions/html-language-features/server/src/modes/javascriptSemanticTokens.ts

@@ -99,7 +99,7 @@ function classifySymbol(symbol: ts.Symbol) {
 }
 
 export const enum TokenType {
- class, enum, interface, namespace, typeParameter, type, parameter, variable, property, function, member, _
+ class, enum, interface, namespace, typeParameter, type, parameter, variable, property, function, method, _
 }
 
 export const enum TokenModifier {
@@ -117,7 +117,7 @@ tokenTypes[TokenType.parameter] = 'parameter';
 tokenTypes[TokenType.variable] = 'variable';
 tokenTypes[TokenType.property] = 'property';
 tokenTypes[TokenType.function] = 'function';
-tokenTypes[TokenType.member] = 'member';
+tokenTypes[TokenType.method] = 'method';
 
 const tokenModifiers: string[] = [];
 tokenModifiers[TokenModifier.async] = 'async';
@@ -133,9 +133,9 @@ const tokenFromDeclarationMapping: { [name: string]: TokenType } = {
  [ts.SyntaxKind.EnumDeclaration]: TokenType.enum,
  [ts.SyntaxKind.EnumMember]: TokenType.property,
  [ts.SyntaxKind.ClassDeclaration]: TokenType.class,
- [ts.SyntaxKind.MethodDeclaration]: TokenType.member,
+ [ts.SyntaxKind.MethodDeclaration]: TokenType.method,
  [ts.SyntaxKind.FunctionDeclaration]: TokenType.function,
- [ts.SyntaxKind.MethodSignature]: TokenType.member,
+ [ts.SyntaxKind.MethodSignature]: TokenType.method,
  [ts.SyntaxKind.GetAccessor]: TokenType.property,
  [ts.SyntaxKind.PropertySignature]: TokenType.property,
  [ts.SyntaxKind.InterfaceDeclaration]: TokenType.interface,

extensions/html-language-features/server/src/test/semanticTokens.test.ts

@@ -87,8 +87,8 @@ suite('HTML Semantic Tokens', () => {
  ];
  await assertTokens(input, [
  t(3, 11, 3, 'function.declaration'), t(3, 15, 2, 'parameter.declaration'),
- t(4, 11, 3, 'function'), t(4, 15, 4, 'interface'), t(4, 20, 3, 'member'), t(4, 24, 2, 'parameter'),
- t(6, 6, 6, 'variable'), t(6, 13, 8, 'property'), t(6, 24, 5, 'member'), t(6, 35, 7, 'member'), t(6, 43, 1, 'parameter.declaration'), t(6, 48, 3, 'function'), t(6, 52, 1, 'parameter')
+ t(4, 11, 3, 'function'), t(4, 15, 4, 'interface'), t(4, 20, 3, 'method'), t(4, 24, 2, 'parameter'),
+ t(6, 6, 6, 'variable'), t(6, 13, 8, 'property'), t(6, 24, 5, 'method'), t(6, 35, 7, 'method'), t(6, 43, 1, 'parameter.declaration'), t(6, 48, 3, 'function'), t(6, 52, 1, 'parameter')
  ]);
  });
 
@@ -157,7 +157,7 @@ suite('HTML Semantic Tokens', () => {
  t(3, 8, 1, 'variable.declaration.readonly'),
  t(4, 8, 1, 'class.declaration'), t(4, 28, 1, 'property.declaration.static.readonly'), t(4, 42, 3, 'property.declaration.static'), t(4, 47, 3, 'interface'),
  t(5, 13, 1, 'enum.declaration'), t(5, 17, 1, 'property.declaration.readonly'), t(5, 24, 1, 'property.declaration.readonly'), t(5, 28, 1, 'property.readonly'),
- t(6, 2, 7, 'variable'), t(6, 10, 3, 'member'), t(6, 14, 1, 'variable.readonly'), t(6, 18, 1, 'class'), t(6, 20, 1, 'property.static.readonly'), t(6, 24, 1, 'class'), t(6, 26, 3, 'property.static'), t(6, 30, 6, 'property.readonly'),
+ t(6, 2, 7, 'variable'), t(6, 10, 3, 'method'), t(6, 14, 1, 'variable.readonly'), t(6, 18, 1, 'class'), t(6, 20, 1, 'property.static.readonly'), t(6, 24, 1, 'class'), t(6, 26, 3, 'property.static'), t(6, 30, 6, 'property.readonly'),
  ]);
  });
 
@@ -197,7 +197,7 @@ suite('HTML Semantic Tokens', () => {
  ];
  await assertTokens(input, [
  t(3, 11, 1, 'function.declaration'), t(3, 13, 1, 'typeParameter.declaration'), t(3, 16, 2, 'parameter.declaration'), t(3, 20, 1, 'typeParameter'), t(3, 24, 1, 'typeParameter'), t(3, 39, 2, 'parameter'),
- t(6, 2, 6, 'variable'), t(6, 9, 5, 'member')
+ t(6, 2, 6, 'variable'), t(6, 9, 5, 'method')
  ]);
  });
 
@@ -215,7 +215,7 @@ suite('HTML Semantic Tokens', () => {
  /*9*/'</html>',
  ];
  await assertTokens(input, [
- t(3, 2, 6, 'variable'), t(3, 9, 5, 'member')
+ t(3, 2, 6, 'variable'), t(3, 9, 5, 'method')
  ], [Range.create(Position.create(2, 0), Position.create(4, 0))]);
 
  await assertTokens(input, [

extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts

@@ -174,7 +174,7 @@ tokenTypes[TokenType.variable] = 'variable';
 tokenTypes[TokenType.enumMember] = 'enumMember';
 tokenTypes[TokenType.property] = 'property';
 tokenTypes[TokenType.function] = 'function';
-tokenTypes[TokenType.member] = 'member';
+tokenTypes[TokenType.member] = 'method';
 
 const tokenModifiers: string[] = [];
 tokenModifiers[TokenModifier.async] = 'async';

src/vs/platform/theme/common/tokenClassificationRegistry.ts

@@ -522,7 +522,8 @@ function createDefaultTokenClassificationRegistry(): TokenClassificationRegistry
  registerTokenType('typeParameter', nls.localize('typeParameter', "Style for type parameters."), [['entity.name.type.parameter']]);
 
  registerTokenType('function', nls.localize('function', "Style for functions"), [['entity.name.function'], ['support.function']]);
- registerTokenType('member', nls.localize('member', "Style for member"), [['entity.name.function.member'], ['support.function']]);
+ registerTokenType('member', nls.localize('member', "Style for member functions"), [], 'method', 'Deprecated use `method` instead');
+ registerTokenType('method', nls.localize('method', "Style for method (member functions)"), [['entity.name.function.member'], ['support.function']]);
  registerTokenType('macro', nls.localize('macro', "Style for macros."), [['entity.name.function.preprocessor']]);
 
  registerTokenType('variable', nls.localize('variable', "Style for variables."), [['variable.other.readwrite'], ['entity.name.variable']]);