Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/parser/AstNode.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { AAIndexedMemberExpression, AALiteralExpression, AAMemberExpression
import { expectZeroDiagnostics } from '../testHelpers.spec';
import { tempDir, rootDir, outDir } from '../testHelpers.spec';
import { isAAIndexedMemberExpression, isAALiteralExpression, isAAMemberExpression, isAnnotationExpression, isArrayLiteralExpression, isAssignmentStatement, isBinaryExpression, isBlock, isCallExpression, isCallfuncExpression, isCatchStatement, isClassStatement, isConstStatement, isDimStatement, isDottedGetExpression, isDottedSetStatement, isEnumMemberStatement, isEnumStatement, isExpressionStatement, isForEachStatement, isForStatement, isFunctionExpression, isFunctionStatement, isGroupingExpression, isIfStatement, isIncrementStatement, isIndexedGetExpression, isIndexedSetStatement, isInterfaceFieldStatement, isInterfaceMethodStatement, isInterfaceStatement, isMethodStatement, isNamespaceStatement, isNewExpression, isNullCoalescingExpression, isPrintStatement, isReturnStatement, isTaggedTemplateStringExpression, isTemplateStringExpression, isTemplateStringQuasiExpression, isTernaryExpression, isThrowStatement, isTryCatchStatement, isTypecastExpression, isUnaryExpression, isVariableExpression, isLiteralExpression, isWhileStatement, isXmlAttributeGetExpression } from '../astUtils/reflection';
import type { ConditionalCompileStatement, ClassStatement, FunctionStatement, InterfaceFieldStatement, InterfaceMethodStatement, MethodStatement, InterfaceStatement, CatchStatement, ThrowStatement, EnumStatement, EnumMemberStatement, ConstStatement, Block, PrintStatement, DimStatement, ForStatement, WhileStatement, IndexedSetStatement, NamespaceStatement, TryCatchStatement, DottedSetStatement, ExpressionStatement } from './Statement';
import type { ImportStatement, ConditionalCompileStatement, ClassStatement, FunctionStatement, InterfaceFieldStatement, InterfaceMethodStatement, MethodStatement, InterfaceStatement, CatchStatement, ThrowStatement, EnumStatement, EnumMemberStatement, ConstStatement, Block, PrintStatement, DimStatement, ForStatement, WhileStatement, IndexedSetStatement, NamespaceStatement, TryCatchStatement, DottedSetStatement, ExpressionStatement } from './Statement';
import { AssignmentStatement, EmptyStatement } from './Statement';
import { ParseMode, Parser } from './Parser';
import type { AstNode } from './AstNode';
Expand Down Expand Up @@ -1401,6 +1401,15 @@ describe('AstNode', () => {
testClone(original);
});

it('does not shrink the ImportStatement path range again when cloning', () => {
const original = Parser.parse('import "Something.brs"').ast.statements[0] as ImportStatement;
//the path range excludes the quotes
expect(util.getLocation(original.tokens.path).range).to.eql(util.createRange(0, 8, 0, 21));
const clone = original.clone();
expect(util.getLocation(clone.tokens.path).range).to.eql(util.createRange(0, 8, 0, 21));
expect(util.getLocation(clone.clone().tokens.path).range).to.eql(util.createRange(0, 8, 0, 21));
});


it('clones BinaryExpression', () => {
const original = Parser.parse(`
Expand Down
9 changes: 5 additions & 4 deletions src/parser/Statement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2077,10 +2077,11 @@ export class ImportStatement extends Statement implements TypedefProvider {
if (this.tokens.path) {
//remove quotes
this.filePath = this.tokens.path.text.replace(/"/g, '');
if (this.tokens.path.sourceInfo) {
//adjust the range to exclude the quotes
this.tokens.path.startPosition++;
this.tokens.path.endPosition--;
//adjust the range to exclude the quotes (but only if that hasn't already been done, such as for a cloned token)
const path = this.tokens.path;
if (path.sourceInfo && path.text.startsWith('"') && path.endPosition - path.startPosition === path.text.length) {
path.startPosition++;
path.endPosition--;
}
}
}
Expand Down
Loading