Fix: remove unused parser instance #22053

romgrk · 2021-03-21T04:44:03Z

Hello, this is really trivial and also I'm not using Atom, I just happened to be reading the code, so I'll forgo the bugfix template and make it short, please close if you're not interested:

Issue

In tree-sitter-language-mode.js, each instance of the TreeSitterLanguageMode creates a new tree-sitter Parser in its constructor. This parser instance is never used because the .parse() function uses a parse instance from the PARSER_POOL array.

Solution

Don't create an unused instance.

References

atom/src/tree-sitter-language-mode.js

Line 34 in 7574784

this.parser = new Parser();

atom/src/tree-sitter-language-mode.js

Lines 116 to 133 in 7574784

    
           parse(language, oldTree, ranges) { 
        
             const parser = PARSER_POOL.pop() || new Parser(); 
        
             parser.setLanguage(language); 
        
             const result = parser.parseTextBuffer(this.buffer.buffer, oldTree, { 
        
               syncTimeoutMicros: this.syncTimeoutMicros, 
        
               includedRanges: ranges 
        
             }); 
        
             if (result.then) { 
        
               return result.then(tree => { 
        
                 PARSER_POOL.push(parser); 
        
                 return tree; 
        
               }); 
        
             } else { 
        
               PARSER_POOL.push(parser); 
        
               return result; 
        
             } 
        
           }

sadick254

Deleting code is always fun 😄 . Thank you for your contribution.

fix: remove unused parser instance

9961b6a

sadick254 approved these changes May 19, 2021

View reviewed changes

sadick254 merged commit 81250ab into atom:master May 19, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: remove unused parser instance #22053

Fix: remove unused parser instance #22053

	parse(language, oldTree, ranges) {
	const parser = PARSER_POOL.pop() \|\| new Parser();
	parser.setLanguage(language);
	const result = parser.parseTextBuffer(this.buffer.buffer, oldTree, {
	syncTimeoutMicros: this.syncTimeoutMicros,
	includedRanges: ranges
	});

	if (result.then) {
	return result.then(tree => {
	PARSER_POOL.push(parser);
	return tree;
	});
	} else {
	PARSER_POOL.push(parser);
	return result;
	}
	}

Fix: remove unused parser instance #22053

Fix: remove unused parser instance #22053

Conversation

Issue

Solution

References

Choose a reason for hiding this comment