Fix merge issues

Author: AndreasArvidsson

packages/common/src/scopeSupportFacets/java.ts

@@ -135,7 +135,7 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "name.iteration.enum": supported,
   "name.iteration.block": supported,
   "name.resource": supported,
-
+  "value.switch": supported,
   "value.assignment": supported,
   "value.foreach": supported,
   "value.field.class": supported,
@@ -164,15 +164,6 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "type.class": supported,
   "type.enum": supported,
   "type.interface": supported,
-
-  "value.assignment": supported,
-  "value.foreach": supported,
-  "value.field": supported,
-  "value.return": supported,
-  "value.return.lambda": supported,
-  "value.variable": supported,
-  "value.resource": supported,
-  "value.switch": supported,
   "type.iteration.block": supported,
   "type.iteration.class": supported,
   "type.iteration.interface": supported,

packages/common/src/scopeSupportFacets/javascript.ts

@@ -164,8 +164,6 @@ export const javascriptCoreScopeSupport: LanguageScopeSupportFacetMap = {
   "value.field.class": supported,
   "value.yield": supported,
   "value.switch": supported,
-
-  "type.class": supported,
   "value.iteration.block": supported,
   "value.iteration.class": supported,
   "value.iteration.document": supported,

packages/common/src/scopeSupportFacets/talon.ts

@@ -224,8 +224,6 @@ export const talonScopeSupport: LanguageScopeSupportFacetMap = {
   "section.iteration.document": notApplicable,
   "section.iteration.parent": notApplicable,
   startTag: notApplicable,
-  "statement.class": notApplicable,
-  switchStatementSubject: notApplicable,
   tags: notApplicable,
   "textFragment.comment.block": notApplicable,
   "textFragment.element": notApplicable,