DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Handle reserved Kotlin keywords (#84973)" (#86512)

Browse Source 
This reverts commit a67f618a2971098b0c78a39b982b0972819c06c8.
This commit is contained in:
Zachary Anderson 2021-07-15 14:43:53 -07:00 committed by GitHub
parent 183c8f0d1d
commit 09a38d7a17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/flutter_tools/lib/src/template.dart
View File

@ -322,18 +322,6 @@ class Template {
if (sourceFile.path.endsWith(templateExtension)) {
final String templateContents = sourceFile.readAsStringSync();
final String? androidIdentifier = context['androidIdentifier'] as String?;
if (finalDestinationFile.path.endsWith('.kt') && androidIdentifier != null) {
final List<String> segments = androidIdentifier
.split('.')
.toList();
final List<String> reserved = <String>['when', 'in'];
final List<String> correctedSegments = segments.map(
(String segment) => reserved.contains(segment) ? '`$segment`' : segment
).toList();
context['androidIdentifier'] = correctedSegments.join('.');
}
final String renderedContents = _templateRenderer.renderString(templateContents, context);
finalDestinationFile.writeAsStringSync(renderedContents);

52
packages/flutter_tools/test/general.shard/android/template_test.dart
View File

@ -1,52 +0,0 @@
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// @dart = 2.8
import 'package:file/file.dart';
import 'package:file/memory.dart';
import 'package:flutter_tools/src/base/logger.dart';
import 'package:flutter_tools/src/isolated/mustache_template.dart';
import 'package:flutter_tools/src/template.dart';
import '../../src/common.dart';
void main() {
testWithoutContext('kotlin reserved keywords', () {
final FileSystem fileSystem = MemoryFileSystem.test();
final BufferLogger logger = BufferLogger.test();
final Directory rootDir = fileSystem.systemTempDirectory.createTempSync('flutter_template_test.');
final Directory templateSource = rootDir.childDirectory('src');
final Directory baseDir = templateSource;
final Directory imageSourceDir = templateSource;
final Directory destination = rootDir.childDirectory('dest');
const String outputClass = 'SomeClass.kt';
final File sourceFile = templateSource.childFile('$outputClass.tmpl');
templateSource.createSync();
sourceFile.writeAsStringSync('package {{androidIdentifier}};');
final Template template = Template(
templateSource,
baseDir,
imageSourceDir,
fileSystem: fileSystem,
logger: logger,
templateRenderer: const MustacheTemplateRenderer(),
templateManifest: null
);
final Map<String, Object> context = <String, Object>{
'androidIdentifier': 'in.when.there'
};
template.render(destination, context);
final File destinationFile = destination.childFile(outputClass);
expect(destinationFile.readAsStringSync(), equals('package `in`.`when`.there;'));
});
}