Rename sass modeId to scss in legacy mode

src/vs/languages/sass/common/sass.contribution.ts

@@ -12,7 +12,7 @@ import LintRules = require('vs/languages/css/common/services/lintRules');
 import ConfigurationRegistry = require('vs/platform/configuration/common/configurationRegistry');
 
 ModesRegistry.registerCompatMode({
-	id: 'sass',
+	id: 'scss',
 	extensions: ['.scss'],
 	aliases: ['Sass', 'sass', 'scss'],
 	mimetypes: ['text/x-scss', 'text/scss'],
@@ -22,11 +22,11 @@ ModesRegistry.registerCompatMode({
 
 var configurationRegistry = <ConfigurationRegistry.IConfigurationRegistry>Platform.Registry.as(ConfigurationRegistry.Extensions.Configuration);
 configurationRegistry.registerConfiguration({
-	'id': 'sass',
+	'id': 'scss',
 	'order': 24,
-	'title': nls.localize('sassConfigurationTitle', "Sass configuration"),
+	'title': nls.localize('sassConfigurationTitle', "SCSS (Sass) configuration"),
 	'allOf': [{
-		'title': nls.localize('sassLint', "Controls Sass validation and problem severities."),
+		'title': nls.localize('sassLint', "Controls SCSS validation and problem severities."),
 		'properties': LintRules.getConfigurationProperties('sass')
 	}]
 });
\ No newline at end of file

src/vs/languages/sass/common/sass.ts

@@ -25,7 +25,7 @@ import {LanguageConfigurationRegistry, IRichLanguageConfiguration} from 'vs/edit
 
 export var language = <Types.IMonarchLanguage>{
 	defaultToken: '',
-	tokenPostfix: '.sass',
+	tokenPostfix: '.scss',
 
 	ws: '[ \t\n\r\f]*', // whitespaces (referenced in several rules)
 	identifier: '-?-?([a-zA-Z]|(\\\\(([0-9a-fA-F]{1,6}\\s?)|[^[0-9a-fA-F])))([\\w\\-]|(\\\\(([0-9a-fA-F]{1,6}\\s?)|[^[0-9a-fA-F])))*',

src/vs/workbench/parts/emmet/node/editorAccessor.ts

@@ -121,11 +121,8 @@ export class EditorAccessor implements emmet.Editor {
 		if (/\b(typescriptreact|javascriptreact)\b/.test(syntax)) { // treat like tsx like jsx
 			return 'jsx';
 		}
-		if (syntax === 'sass') { // sass is really scss... map it to scss
-			return'scss';
-		}
 		if (syntax === 'stylus') { // map stylus to css
-			return'css';
+			return 'css';
 		}
 		return syntax;
 	}